diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cef55e01e..9ddc345a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,19 +1,19 @@ -name: Mineralogy 1.20.1 CI +name: Mineralogy 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: mineralogy-1.20.1-${{ github.workflow }}-${{ github.ref }} + group: mineralogy-1.20.6-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -38,11 +38,11 @@ jobs: distribution: temurin java-version: '8.0.502+7' - - name: Install pinned Java 17 runtime and toolchain + - name: Install pinned Java 21 runtime and toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: '17.0.1+12' + java-version: '21.0.7+6.0.LTS' - name: Bootstrap Forge from an empty cache shell: bash @@ -62,7 +62,7 @@ jobs: | tee "$RUNNER_TEMP/cold-forge-bootstrap.log" grep -F "OreSpawn Mavenizer compatibility runtime: Java 25.0.3" \ "$RUNNER_TEMP/cold-forge-bootstrap.log" - grep -F "OreSpawn Mavenizer compatibility: applied 8 rule(s) for net.minecraftforge:forge:1.20.1-47.4.10" \ + grep -F "OreSpawn Mavenizer compatibility: applied 0 rule(s) for net.minecraftforge:forge:1.20.6-50.2.0 (explicit no-op)" \ "$RUNNER_TEMP/cold-forge-bootstrap.log" find "$GRADLE_USER_HOME" .gradle/mavenizer \ -name '*.orespawn-compatibility' -type f -print0 \ @@ -106,11 +106,11 @@ jobs: distribution: temurin java-version: '8.0.502+7' - - name: Install pinned Java 17 runtime and toolchain + - name: Install pinned Java 21 runtime and toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: '17.0.1+12' + java-version: '21.0.7+6.0.LTS' - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 @@ -144,13 +144,13 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: Mineralogy-1.20.1-${{ github.sha }} + name: Mineralogy-1.20.6-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/Mineralogy-6.1.1.120011.jar - build/libs/Mineralogy-6.1.1.120011-sources.jar - build/libs/Mineralogy-6.1.1.120011-javadoc.jar + build/libs/Mineralogy-6.1.1.120061.jar + build/libs/Mineralogy-6.1.1.120061-sources.jar + build/libs/Mineralogy-6.1.1.120061-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -158,7 +158,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: Mineralogy-1.20.1-diagnostics-${{ github.sha }} + name: Mineralogy-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 82413807e..891bad109 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 schedule: - cron: '43 7 * * 4' @@ -38,11 +38,11 @@ jobs: distribution: temurin java-version: '8.0.502+7' - - name: Install pinned Java 17 runtime and toolchain + - name: Install pinned Java 21 runtime and toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: '17.0.1+12' + 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/CHANGELOG.txt b/CHANGELOG.txt index 42b9557b3..37e64688d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,13 +1,13 @@ -Mineralogy 6.1.1.120011 for Minecraft 1.20.1 +Mineralogy 6.1.1.120061 for Minecraft 1.20.6 - Delegated terrain, strata, ore, and covered fluid-deposit generation to the - released OreSpawn 4.0.16.120011 provider engine, retaining the supported + released OreSpawn 4.0.16.120061 provider engine, retaining the supported `[4.0.6,5.0.0)` range; removed Mineralogy's parallel geology, geome, ore, noise, and stone-replacement generators. - Preserved all world-facing registry, tile, NBT, recipe, asset, patch, and pre-flattening conversion identities while moving production packages to zone.moddev.mc.mineralogy. Existing 1.10/1.12 chunks are protected during - 1.20.1's flattening conversion. Legacy rock-furnace IDs are established + 1.20.6's flattening conversion. Legacy rock-furnace IDs are established before Mojang data fixing, then all pre-namespaced tile IDs are made safe before Forge constructs tile entities, so inventories and progress survive and an uppercase vanilla ID cannot abort the complete chunk load. @@ -25,11 +25,11 @@ Mineralogy 6.1.1.120011 for Minecraft 1.20.1 - Made the historical `COBBLESTONE_EQUIVILENT` option functional through target-native per-family block and item tags, including vanilla aliases, reapplied after data reloads by updating the exact immutable tag objects - retained by already-parsed Forge 47 recipe ingredients. Chert and pumice + retained by already-parsed Forge 50 recipe ingredients. Chert and pumice remain unconditional cobblestone equivalents. - Added isolated Mineralogy crude-oil source and flowing fluids, block, bucket, rendering resources, and the covered Ocean deposit declaration. -- Uses Minecraft 1.20.1's native granite, diorite, andesite, basalt, and tuff for +- Uses Minecraft 1.20.6's native granite, diorite, andesite, basalt, and tuff for new OreSpawn terrain while retaining Mineralogy's historical registrations and conversion aliases. Native smooth basalt joins Mineralogy's smooth-basalt family without replacing Minecraft's basalt-smelting route. Deepslate remains @@ -55,7 +55,7 @@ Mineralogy 6.1.1.120011 for Minecraft 1.20.1 slab and back at a lossless 1:1 ratio for modpacks that require an exact vanilla item. Recipe advancements use the same exact item or family tag as the recipe they reveal. -- Extended Minecraft 1.20.1's native stone crafting and tool-material tags so +- Extended Minecraft 1.20.6's native stone crafting and tool-material tags so every enabled cobblestone equivalent, including all 27 legacy rock families and target-native aliases, works in the complete vanilla contract. Nineteen conditional JSON overrides cover furnaces, brewing stands, redstone and @@ -70,7 +70,7 @@ Mineralogy 6.1.1.120011 for Minecraft 1.20.1 existing template-owned advancements remain untouched. - Added `sends_telemetry_event: false` to every generated recipe advancement, including all conditional Minecraft advancement branches. -- Prevented Forge 47 from silently reducing optional carbon- or coal-dust +- Prevented Forge 50 from silently reducing optional carbon- or coal-dust gunpowder recipes to nitrate plus sulfur when their compatibility tag is empty; every loaded gunpowder recipe now requires all three components. - Added 17 reviewed UTF-8 JSON locales with the same 938 ordered keys, including @@ -78,7 +78,7 @@ Mineralogy 6.1.1.120011 for Minecraft 1.20.1 Russian. - Added first-start player, developer, content, provider, and version guides, plus an exact provider example. Existing exported guides are never - overwritten. Forge 47 Eclipse launches keep their required merged + overwritten. Forge 50 Eclipse launches keep their required merged `bin/main` mod output; if Eclipse removes Gradle's staged guide copies, the exporter reads the authoritative source-checkout guides without weakening packaged-jar validation. @@ -90,14 +90,14 @@ Mineralogy 6.1.1.120011 for Minecraft 1.20.1 entries onto Mineralogy's stable provider rule IDs. This prevents duplicate ore generation and preserves world-specific geology choices on first start; established OreSpawn files remain authoritative and reloads are byte-stable. -- Preserved 1.20.1-native wall tall-side blockstates and models, wall/item tags, - loot tables, fluid APIs, rendering setup, and pack format 15 resources. -- Added reproducible Java 17 main, sources, and Javadoc artifacts, exact released - OreSpawn dependency verification, guarded 1.20.1 CI, and the four-component - release tag `6.1.1.120011`. -- Kept ForgeGradle 7 while sealing Forge 47's required Mavenizer compatibility +- Preserved 1.20.6-native wall tall-side blockstates and models, wall/item tags, + loot tables, fluid APIs, rendering setup, and pack format 32 resources. +- Added reproducible Java 21 main, sources, and Javadoc artifacts, exact released + OreSpawn dependency verification, guarded 1.20.6 CI, and the four-component + release tag `6.1.1.120061`. +- Kept ForgeGradle 7 while sealing Forge 50's audited zero-repair Mavenizer fixture by SHA-256. The build-only tool runs on Java 25; Mineralogy compiles - and ships exclusively as Java 17, and release audits reject fixture leakage. + and ships exclusively as Java 21, and release audits reject fixture leakage. - Isolated CI's verified OreSpawn artifact in an exclusive Gradle repository so dependency resolution cannot fall through to an unverified public copy. Release verification also enforces Maven coordinate diff --git a/README.md b/README.md index 57c6ef361..808aeea10 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ [![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_minecraft-mineralogy_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) [![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_minecraft-mineralogy_all.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) -[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-1.20.1)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.20.1) +[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-1.20.6)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.20.6) -# Mineralogy 6 for Minecraft 1.20.1 +# Mineralogy 6 for Minecraft 1.20.6 Mineralogy adds real-world rock families, matching construction blocks, mineral ores and dusts, rock furnaces, drywall, rock-salt lighting, fertilizer, and crude oil. OreSpawn 4 is the sole terrain, strata, ore, and deposit engine; Mineralogy no longer installs a parallel world generator. -This branch builds Mineralogy `6.1.1.120011` for Forge `47.4.10` and is built -and tested against OreSpawn `4.0.16.120011`. Its declared compatibility range is +This branch builds Mineralogy `6.1.1.120061` for Forge `50.2.0` and is built +and tested against OreSpawn `4.0.16.120061`. Its declared compatibility range is OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers. ## Configuration and help diff --git a/build.gradle b/build.gradle index 8daa371e8..999ca28b7 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,6 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.minecraftforge.renamer' version '1.1.5' id 'net.minecraftforge.gradle' version '7.0.34' } @@ -37,18 +36,18 @@ def mavenizerLicense = mavenizerToolsDirectory.file('LICENSE-MAVENIZER.txt') def mavenizerReadme = mavenizerToolsDirectory.file('README.md') def mavenizerFixtureChecksums = [ (mavenizerCompatibilityJar.asFile): - '416DCA4797BC55826F0DDCF03FDC405F1990FC15C2133FA27A1F143BF7976177', + '4B14145595E900F178A082F2253A756F63897E6F61C2B8B5E7C819B82CD79E8C', (mavenizerRuleManifest.asFile): - '8945511DFF53B8F1A91EE44B14AF9EC7DB34C373617EA37A608C6958BFEEB22E', + '931DAB31C238D8C9C38239671A61DA0942ADADF80149D6359197EE80A16380A8', (mavenizerSourcePatch.asFile): - 'D856190DEF5574716C5E4F4379912C451B1F5952B0B111576651A98EECF58544', + 'A140C21312C2A5A8AFC56DC0B037B94D222CA68A7B868512B91684CD3754B650', (mavenizerLicense.asFile): '20C17D8B8C48A600800DFD14F95D5CB9FF47066A9641DDEAB48DC54AEC96E331', (mavenizerReadme.asFile): - '177C1DDEDEF9704B9FDC8EA24B8DCDF4DDCC826DD0E253E7872A00DB2EA34518' + '25121D3DF400E3C76D87E39985FEDC43BCDAE82E52B75A53A30DA490FF268F71' ] -// ForgeGradle invokes Mavenizer while configuring Forge 47. Verify the exact +// ForgeGradle invokes Mavenizer while configuring Forge 50. Verify the exact // target-aware build-only tool and rule manifest before any fixture code runs. [mavenizerCompatibilityJar.asFile, mavenizerRuleManifest.asFile].each { fixture -> if (!fixture.isFile()) { @@ -89,13 +88,13 @@ def versionParts = project.mod_version.toString().tokenize('.') if (versionParts.size() != 4 || !versionParts.every { it ==~ /\d+/ }) { throw new GradleException("mod_version must use Major.Minor.Bug.Target numeric form: ${project.mod_version}") } -if (versionParts[3] != '120011') { - throw new GradleException("Mineralogy 1.20.1 Forge releases must use target 120011: ${project.mod_version}") +if (versionParts[3] != '120061') { + throw new GradleException("Mineralogy 1.20.6 Forge releases must use target 120061: ${project.mod_version}") } java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) vendor = JvmVendorSpec.ADOPTIUM } withSourcesJar() @@ -109,11 +108,11 @@ tasks.named('sourcesJar', Jar) { 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(['-Xlint:deprecation', '-Xmaxerrs', '1000']) } @@ -146,17 +145,24 @@ minecraft { def developmentModOutput = layout.buildDirectory.dir('forge-run-mod-classes/main') def prepareDevelopmentMod = tasks.register('prepareDevelopmentMod', Sync) { group = 'ide' - description = 'Merges production classes and resources for Forge 47 development discovery.' + description = 'Merges production classes and resources for Forge 50 development discovery.' dependsOn tasks.named('classes') from sourceSets.main.output.classesDirs from sourceSets.main.output.resourcesDir into developmentModOutput } -def configureForge47Run = { JavaExec runTask, String launchTarget -> +def configureForge50Run = { JavaExec runTask, String launchTarget -> runTask.dependsOn prepareDevelopmentMod - runTask.environment 'MOD_CLASSES', "mineralogy%%${developmentModOutput.get().asFile}" runTask.doFirst { + Set splitOutputs = sourceSets.main.output.files.collect { + it.canonicalFile.absolutePath + } as Set + Collection targetClasspath = runTask.classpath.files.findAll { + !splitOutputs.contains(it.canonicalFile.absolutePath) + } + runTask.classpath = files(developmentModOutput, targetClasspath) + runTask.environment 'MOD_CLASSES', "mineralogy%%${developmentModOutput.get().asFile}" // Forge scans the mods directory before FML creates it and logs an // otherwise harmless ERROR on a completely fresh run directory. File modsDirectory = new File(runTask.workingDir, 'mods') @@ -168,7 +174,7 @@ def configureForge47Run = { JavaExec runTask, String launchTarget -> tasks.withType(JavaExec).configureEach { JavaExec runTask -> String launchTarget = [runClient: 'fmluserdevclient', runServer: 'fmluserdevserver'][runTask.name] - if (launchTarget != null) configureForge47Run(runTask, launchTarget) + if (launchTarget != null) configureForge50Run(runTask, launchTarget) } def orespawnModule = "mmd-orespawn-${project.orespawn_curse_project_id}" @@ -206,20 +212,13 @@ configurations { dependencies { implementation minecraft.dependency("net.minecraftforge:forge:${project.mc_version}-${project.forge_version}") - // Development runs need a mapped view of the released, reobfuscated - // OreSpawn jar. ForgeGradle 7 delegates third-party mod remapping to - // Renamer Gradle. The separate verification configuration below still - // resolves and hashes the untouched release file. - runtimeOnly renamer.dependency("curse.maven:mmd-orespawn-${project.orespawn_curse_project_id}:${project.orespawn_curse_file_id}") + // Forge 50 uses official names in both development and production, so the + // exact released OreSpawn artifact is suitable for ordinary runtime use. + runtimeOnly "curse.maven:mmd-orespawn-${project.orespawn_curse_project_id}:${project.orespawn_curse_file_id}" orespawnRelease "curse.maven:mmd-orespawn-${project.orespawn_curse_project_id}:${project.orespawn_curse_file_id}" testImplementation 'junit:junit:4.13.2' } -// ForgeGradle 7 exposes mapped third-party mod dependencies through Renamer -// Gradle. Use the same named-to-SRG map as this project's release jar; the -// dependency helper applies it in reverse for the development runtime. -renamer.mappings.from minecraft.dependency.toSrgFile - configurations.named('testRuntimeClasspath') { exclude group: 'curse.maven', module: "mmd-orespawn-${project.orespawn_curse_project_id}" } @@ -261,8 +260,8 @@ processResources { } tasks.named('jar', Jar) { - archiveClassifier = 'deobf' - destinationDirectory = layout.buildDirectory.dir('libs-dev') + archiveClassifier = '' + destinationDirectory = layout.buildDirectory.dir('libs') manifest { attributes([ 'Maven-Artifact' : "${project.group}:${base.archivesName.get()}:${project.version}", @@ -272,7 +271,7 @@ tasks.named('jar', Jar) { 'Implementation-Title' : 'Mineralogy', 'Implementation-Version': project.version, 'Implementation-Vendor' : 'SkyBlade1978', - 'Built-On-Java' : '17', + 'Built-On-Java' : '21', 'Built-On' : "${project.mc_version}-${project.forge_version}" ]) } @@ -288,11 +287,11 @@ tasks.register('compileOilCompatibilityFixture', JavaCompile) { classpath = files(sourceSets.main.output, sourceSets.main.compileClasspath) destinationDirectory = oilCompatibilityClasses javaCompiler = javaToolchains.compilerFor { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) vendor = JvmVendorSpec.ADOPTIUM } options.encoding = 'UTF-8' - options.release = 17 + options.release = 21 } tasks.register('oilCompatibilityFixtureJar', Jar) { dependsOn tasks.named('compileOilCompatibilityFixture') @@ -301,9 +300,52 @@ tasks.register('oilCompatibilityFixtureJar', Jar) { from oilCompatibilityClasses from 'src/oilCompatibilityTest/resources' } -def packagedOilCompatibilityFixtureJar = renamer.classes(tasks.named('oilCompatibilityFixtureJar', Jar)) { - map.from minecraft.dependency.toSrgFile - output = layout.buildDirectory.file('oil-compatibility-fixture/oilcompatprobe-reobf.jar') +def packagedOilCompatibilityFixtureJar = tasks.named('oilCompatibilityFixtureJar', Jar) + +// Loader-side recipe validation probe. It is compiled separately and is used +// only in disposable Forge server runs so the real condition, recipe, tag, and +// advancement managers validate the generated data. It is never published. +def recipeIntegrationClasses = file("${buildDir}/recipe-integration-fixture/classes") +tasks.register('compileRecipeIntegrationFixture', JavaCompile) { + dependsOn tasks.named('classes') + source fileTree('src/recipeIntegrationTest/java') + classpath = files(sourceSets.main.output, sourceSets.main.compileClasspath) + destinationDirectory = recipeIntegrationClasses + javaCompiler = javaToolchains.compilerFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.ADOPTIUM + } + options.encoding = 'UTF-8' + options.release = 21 +} +tasks.register('recipeIntegrationFixtureJar', Jar) { + dependsOn tasks.named('compileRecipeIntegrationFixture') + archiveFileName = 'recipeintegrationprobe.jar' + destinationDirectory = file("${buildDir}/recipe-integration-fixture") + from recipeIntegrationClasses + from 'src/recipeIntegrationTest/resources' +} +def packagedRecipeIntegrationFixtureJar = tasks.named('recipeIntegrationFixtureJar', Jar) + +tasks.register('runRegionPaletteAudit', JavaExec) { + group = 'verification' + description = 'Audits block-state palettes in a disposable Anvil region directory.' + dependsOn tasks.named('compileRecipeIntegrationFixture') + classpath = files(recipeIntegrationClasses, sourceSets.main.runtimeClasspath) + mainClass = 'zone.moddev.mc.mineralogy.recipeprobe.RegionPaletteAudit' + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.ADOPTIUM + } + doFirst { + String regionDirectory = providers.gradleProperty('regionAuditDirectory').orNull + String auditOutput = providers.gradleProperty('regionAuditOutput').orNull + String auditTargets = providers.gradleProperty('regionAuditTargets').orNull + if ([regionDirectory, auditOutput, auditTargets].any { it == null || it.trim().isEmpty() }) { + throw new GradleException('runRegionPaletteAudit requires regionAuditDirectory, regionAuditOutput, and regionAuditTargets') + } + args regionDirectory, auditOutput, auditTargets + } } tasks.register('verifyOilCompatibilityFixtureIsolation') { @@ -315,9 +357,12 @@ tasks.register('verifyOilCompatibilityFixtureIsolation') { if (!artifact.isFile()) return new java.util.zip.ZipFile(artifact).withCloseable { zip -> if (zip.entries().toList().any { entry -> - entry.name.contains('oilcompatprobe') || entry.name.contains('oilCompatibilityTest') + entry.name.contains('oilcompatprobe') || entry.name.contains('oilCompatibilityTest') || + entry.name.contains('recipeintegrationprobe') || + entry.name.contains('recipeIntegrationTest') || + entry.name.startsWith('zone/moddev/mc/mineralogy/fixture/') }) { - throw new GradleException("Oil compatibility fixture leaked into ${artifact.name}") + throw new GradleException("A packaged-runtime fixture leaked into ${artifact.name}") } } } @@ -328,6 +373,20 @@ eclipse { classpath { downloadSources = true downloadJavadoc = true + file.whenMerged { classpath -> + // Eclipse must consume processResources output. If it copies the + // raw source tree, ${version} in mods.toml becomes the exploded + // directory name "main" and Forge can no longer identify its + // Minecraft system mod. + classpath.entries.removeAll { entry -> + entry instanceof org.gradle.plugins.ide.eclipse.model.SourceFolder + && entry.path == 'src/main/resources' + } + if (!classpath.entries.any { entry -> entry.path == 'build/resources/main' }) { + classpath.entries.add(new org.gradle.plugins.ide.eclipse.model.SourceFolder( + 'build/resources/main', 'bin/main')) + } + } } synchronizationTasks 'isolateEclipseProductionRuns' } @@ -339,12 +398,7 @@ idea { } } -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() } @@ -454,14 +508,12 @@ tasks.register('verifyMavenizerCompatibilityFixture') { def parsed = new JsonSlurper().parse(mavenizerRuleManifest.asFile) if (parsed.schema != 1 || parsed.targets.keySet() != - ['net.minecraftforge:forge:1.20.1-47.4.10'] as Set) { + ['net.minecraftforge:forge:1.20.6-50.2.0'] as Set) { throw new GradleException('Mavenizer target-rule manifest has unexpected targets or schema') } - def forgeRules = parsed.targets['net.minecraftforge:forge:1.20.1-47.4.10'] - def ruleIds = forgeRules.rules.collect { it.id } - if (forgeRules.expectedApplications != 8 || forgeRules.rules.size() != 8 - || ruleIds.toSet().size() != 8) { - throw new GradleException('Mavenizer target-rule manifest must define eight unique Forge 47 rules') + def forgeRules = parsed.targets['net.minecraftforge:forge:1.20.6-50.2.0'] + if (forgeRules.expectedApplications != 0 || !forgeRules.rules.isEmpty()) { + throw new GradleException('Forge 50 Mavenizer target must be an explicit zero-rule qualification') } ZipFile fixtureJar = new ZipFile(mavenizerCompatibilityJar.asFile) @@ -508,8 +560,9 @@ tasks.register('verifyMavenizerCompatibilityFixture') { String patchText = mavenizerSourcePatch.asFile.getText('UTF-8') String licenseText = mavenizerLicense.asFile.getText('UTF-8') if (!readme.contains('6968241ce7a0a902cdc1c534b976e8373a423091') - || !readme.contains('Temurin `25.0.3+9`')) { - throw new GradleException('Mavenizer provenance or Java 25 build instructions are incomplete') + || !readme.contains('Temurin `25.0.3+9`') + || !readme.contains('1.20.6-50.2.0')) { + throw new GradleException('Mavenizer provenance, target, or Java 25 build instructions are incomplete') } if (!patchText.contains('SourceCompatibilityPatcher.java') || !patchText.contains('minecraft-source-compatibility.json')) { @@ -523,16 +576,16 @@ tasks.register('verifyMavenizerCompatibilityFixture') { tasks.register('verifyReleaseConfiguration') { group = 'verification' - description = 'Verifies the exact Mineralogy 1.20.1 release identity.' + description = 'Verifies the exact Mineralogy 1.20.6 release identity.' dependsOn tasks.named('verifyMavenizerCompatibilityFixture') doLast { - if (project.mod_version != '6.1.1.120011' + if (project.mod_version != '6.1.1.120061' || project.mod_group != expectedMavenGroup - || project.minecraft_version != '1.20.1' - || project.forge_version != '47.4.10' + || project.minecraft_version != '1.20.6' + || project.forge_version != '50.2.0' || project.mcp_mappings_channel != 'official' - || project.mcp_mappings_version != '1.20.1') { - throw new GradleException('Unexpected Mineralogy 1.20.1 release identity') + || project.mcp_mappings_version != '1.20.6') { + throw new GradleException('Unexpected Mineralogy 1.20.6 release identity') } } } @@ -541,20 +594,20 @@ tasks.register('verifyReleaseDependencies') { group = 'verification' description = 'Resolves and verifies the exact released OreSpawn dependency.' doLast { - if (project.mod_version != '6.1.1.120011' + if (project.mod_version != '6.1.1.120061' || project.minecraft_version != project.mc_version - || project.mc_version != '1.20.1' + || project.mc_version != '1.20.6' || project.loader_name != 'forge' || project.loader_code != '1' - || project.java_version != '17' - || project.java_toolchain_version != '17.0.1+12' - || project.gradle_java_version != '17' + || project.java_version != '21' + || project.java_toolchain_version != '21.0.7+6' + || project.gradle_java_version != '21' || project.curseforge_project_id != '240974') { throw new GradleException('Unexpected generic release dispatcher metadata') } - if (project.orespawn_version != '4.0.16.120011' || + if (project.orespawn_version != '4.0.16.120061' || project.orespawn_curse_project_id != '245586' || - project.orespawn_curse_file_id != '8784008') { + project.orespawn_curse_file_id != '8786031') { throw new GradleException('Unexpected OreSpawn release coordinates') } File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts @@ -588,6 +641,7 @@ tasks.register('verifyReleaseArtifacts') { if (artifactNames.any { it.startsWith('com/mcmoddev/mineralogy/') || it.startsWith('zone/moddev/mc/mineralogy/worldgen/') || it.startsWith('zone/moddev/mc/mineralogy/probe/') || + it.startsWith('zone/moddev/mc/mineralogy/fixture/') || it.startsWith('zone/moddev/mc/mineralogy/test/') || it.startsWith('ci-fixtures/') || it.contains('minecraft-mavenizer') || it.startsWith('src/test/') || @@ -628,6 +682,7 @@ tasks.register('verifyReleaseArtifacts') { if (names.any { it.startsWith('com/mcmoddev/mineralogy/') || it.startsWith('zone/moddev/mc/mineralogy/worldgen/') || it.startsWith('zone/moddev/mc/mineralogy/probe/') || + it.startsWith('zone/moddev/mc/mineralogy/fixture/') || it.startsWith('zone/moddev/mc/mineralogy/test/') || it.startsWith('ci-fixtures/') || it.contains('minecraft-mavenizer') || it == 'AGENTS.md' || it.contains('/agent-notes/') }) { @@ -645,7 +700,7 @@ tasks.register('verifyReleaseArtifacts') { throw new GradleException("Invalid class header in ${entry.name}") } int major = ((header[6] & 0xff) << 8) | (header[7] & 0xff) - if (major != 61) throw new GradleException("${entry.name} is class version ${major}, expected Java 17 (61)") + if (major != 65) throw new GradleException("${entry.name} is class version ${major}, expected Java 21 (65)") } finally { stream.close() @@ -660,7 +715,7 @@ tasks.register('verifyReleaseArtifacts') { ?.dimensions?.get('minecraft:overworld') if (!provider.rocks.values().every { it.min_y == -64 && it.max_y == 319 } || oil?.min_y != -48 || oil?.max_y != 48) { - throw new GradleException('Packaged provider does not use Minecraft 1.20.1 world heights') + throw new GradleException('Packaged provider does not use Minecraft 1.20.6 world heights') } if (provider.rocks['mineralogy:rock/minecraft/basalt']?.block != 'minecraft:basalt' || provider.rocks['mineralogy:rock/minecraft/tuff']?.block != 'minecraft:tuff' || @@ -676,7 +731,7 @@ tasks.register('verifyReleaseArtifacts') { ore.dimensions?.get('minecraft:overworld')?.host_tags == ['minecraft:stone_ore_replaceables', 'minecraft:deepslate_ore_replaceables'] }) { - throw new GradleException('Packaged provider does not use the Minecraft 1.20.1 native-rock and deepslate contract') + throw new GradleException('Packaged provider does not use the Minecraft 1.20.6 native-rock and deepslate contract') } byte[] providerBytes = zip.getInputStream( zip.getEntry('data/mineralogy/orespawn/provider.json')).bytes @@ -694,15 +749,24 @@ tasks.register('verifyReleaseArtifacts') { if (recipes.size() != 1427 || advancements.size() != 1427) { throw new GradleException("Release jar must contain 1427 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") } + def allTheRocks = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( + 'data/mineralogy/advancements/mineralogy/all_the_rocks.json'))) + if (allTheRocks.display?.icon?.id != 'mineralogy:basalt' + || allTheRocks.display.icon.containsKey('item')) { + throw new GradleException('Custom advancement icon must use the Minecraft 1.20.6 item-stack id field') + } def verifyAdvancementPredicates = { advancement, String source -> advancement.criteria?.each { criterionName, criterion -> if (criterion.trigger == 'minecraft:inventory_changed') { def predicates = criterion.conditions?.items if (!(predicates instanceof Collection) || predicates.any { predicate -> - predicate.item != null || (predicate.tag == null && - (!(predicate.items instanceof Collection) || predicate.items.isEmpty())) + if (predicate.item != null || predicate.tag != null || predicate.items == null) return true + def holderSet = predicate.items + return holderSet instanceof Collection + ? holderSet.isEmpty() || holderSet.any { !(it instanceof String) || it.isEmpty() } + : !(holderSet instanceof String) || holderSet.isEmpty() }) { - throw new GradleException("Invalid Minecraft 1.20.1 item predicate in ${source}: ${criterionName}") + throw new GradleException("Invalid Minecraft 1.20.6 item predicate in ${source}: ${criterionName}") } } } @@ -713,7 +777,7 @@ tasks.register('verifyReleaseArtifacts') { }.each { entryName -> def advancement = new JsonSlurper().parse(zip.getInputStream(zip.getEntry(entryName))) if (advancement.sends_telemetry_event != false) { - throw new GradleException("Minecraft 1.20.1 recipe advancement must disable telemetry: ${entryName}") + throw new GradleException("Minecraft 1.20.6 recipe advancement must disable telemetry: ${entryName}") } if (advancement.criteria != null) verifyAdvancementPredicates(advancement, entryName) } @@ -731,10 +795,11 @@ tasks.register('verifyReleaseArtifacts') { def advancement = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( "data/mineralogy/advancements/recipes/${bridge.name}.json"))) if (recipe.type != 'minecraft:crafting_shapeless' || recipe.ingredients?.size() != 1 || - recipe.ingredients[0].item != bridge.source || recipe.result?.item != bridge.result || - recipe.result?.count != 1 || recipe.conditions?.size() != 2 || - advancement.conditions != recipe.conditions || - advancement.criteria?.has_rock?.conditions?.items?.getAt(0)?.items?.getAt(0) != bridge.source) { + recipe.ingredients[0].item != bridge.source || recipe.result?.id != bridge.result || + recipe.result?.count != 1 || recipe['forge:condition']?.type != 'forge:and' || + recipe['forge:condition']?.values?.size() != 2 || + advancement['forge:condition'] != recipe['forge:condition'] || + advancement.criteria?.has_rock?.conditions?.items?.getAt(0)?.items != bridge.source) { throw new GradleException("Invalid native/Mineralogy slab conversion: ${bridge.name}") } } @@ -764,9 +829,9 @@ tasks.register('verifyReleaseArtifacts') { cobblestoneOverrides.each { recipe -> def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry("data/minecraft/recipes/${recipe}.json"))) if (data.type != 'forge:conditional' || data.recipes?.size() != 2 || - data.recipes[0].conditions?.getAt(0)?.type != 'mineralogy:config' || - data.recipes[0].conditions?.getAt(0)?.flag != 'COBBLESTONE_EQUIVILENT' || - data.recipes[1].conditions?.getAt(0)?.type != 'forge:not') { + data.recipes[0]['forge:condition']?.type != 'mineralogy:config' || + data.recipes[0]['forge:condition']?.flag != 'COBBLESTONE_EQUIVILENT' || + data.recipes[1]['forge:condition']?.type != 'forge:not') { throw new GradleException("Invalid conditional cobblestone override: ${recipe}") } if (recipe.startsWith('mossy_cobblestone_from_') && @@ -785,7 +850,7 @@ tasks.register('verifyReleaseArtifacts') { branch.recipe?.pattern == ['#S#', '#C#', '###'] && branch.recipe?.key?.S?.item == result && branch.recipe?.key?.get('#')?.item == 'minecraft:diamond' - && branch.recipe?.result?.item == result + && branch.recipe?.result?.id == result && branch.recipe?.result?.count == 2 && branch.recipe?.category == 'misc' && branch.recipe?.show_notification == true @@ -796,10 +861,21 @@ tasks.register('verifyReleaseArtifacts') { slabOverrides.each { recipe -> def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry("data/minecraft/recipes/${recipe}.json"))) if (data.type != 'forge:conditional' || data.recipes?.size() != 2 || - data.recipes[0].conditions?.getAt(0)?.type != 'forge:item_exists' || - data.recipes[1].conditions?.getAt(0)?.type != 'forge:not') { + data.recipes[0]['forge:condition']?.type != 'forge:item_exists' || + data.recipes[1]['forge:condition']?.type != 'forge:not') { throw new GradleException("Invalid conditional Mineralogy slab override: ${recipe}") } + data.recipes.each { branch -> + def nested = branch.recipe + if (recipe.endsWith('_stonecutting')) { + if (!(nested.result instanceof Map) || nested.result.id == null + || nested.result.count != 2 || nested.containsKey('count')) { + throw new GradleException("Invalid Minecraft 1.20.6 stonecutting result: ${recipe}") + } + } else if (nested.result?.id == null) { + throw new GradleException("Invalid Minecraft 1.20.6 slab result: ${recipe}") + } + } } def families = ['andesite', 'basalt', 'diorite', 'granite', 'rhyolite', 'pegmatite', 'diabase', 'gabbro', 'peridotite', 'basaltic_glass', @@ -845,15 +921,15 @@ tasks.register('verifyReleaseArtifacts') { def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( "data/minecraft/advancements/recipes/${category}/${recipe}.json"))) if (data.advancements?.size() != 2 || - data.advancements[0].conditions?.getAt(0)?.type != 'mineralogy:config' || - data.advancements[1].conditions?.getAt(0)?.type != 'forge:not') { + data.advancements[0]['forge:condition']?.type != 'mineralogy:config' || + data.advancements[1]['forge:condition']?.type != 'forge:not') { throw new GradleException("Invalid conditional advancement override: ${recipe}") } data.advancements.eachWithIndex { branch, index -> - if (branch.advancement?.sends_telemetry_event != false) { + if (branch.sends_telemetry_event != false) { throw new GradleException("Conditional advancement must disable telemetry: ${recipe}") } - verifyAdvancementPredicates(branch.advancement, + verifyAdvancementPredicates(branch, "minecraft:${category}/${recipe} branch ${index}") } } @@ -868,7 +944,7 @@ tasks.register('verifyReleaseArtifacts') { def wallBlockstates = names.findAll { it ==~ /assets\/mineralogy\/blockstates\/.+_wall\.json/ } def tallWallModels = names.findAll { it ==~ /assets\/mineralogy\/models\/block\/.+_wall_side_tall\.json/ } if (wallBlockstates.size() != 108 || tallWallModels.size() != 108) { - throw new GradleException("Release jar must contain all 108 Forge 47 wall blockstates and tall-side models") + throw new GradleException("Release jar must contain all 108 Forge 50 wall blockstates and tall-side models") } } finally { @@ -961,7 +1037,7 @@ tasks.withType(PublishToMavenRepository).configureEach { : tasks.named('verifyPreparedReleaseArtifacts')) } -tasks.register('syncForge47EclipseLaunches') { +tasks.register('syncForge50EclipseLaunches') { group = 'ide' dependsOn tasks.named('processResources') doLast { @@ -994,7 +1070,7 @@ tasks.register('syncForge47EclipseLaunches') { 'show.executions.view=false', '' ].join('\r\n'), 'UTF-8') - // Forge 47 loads the mod solely from Eclipse's merged bin/main output. + // Forge 50 loads the mod solely from Eclipse's merged bin/main output. // Copy the processed production resources as a normal doLast action so // token-expanded metadata and externally edited JSON cannot lag behind // the source tree without making bin/main a Gradle-owned task output. @@ -1017,6 +1093,14 @@ tasks.register('syncForge47EclipseLaunches') { '\r\n' + entries + '') } + if (!text.contains('\r?\n/, + { String environmentHeader -> + environmentHeader + + " \r\n" + }) + } text = text.replace('', "") text = text.replaceFirst( @@ -1050,22 +1134,28 @@ tasks.register('syncForge47EclipseLaunches') { } text = text.replace(programArguments[0][0], programArguments[0][1] + arguments + programArguments[0][3]) + + // Some ForgeGradle/Slime Launcher combinations emit this VM + // argument and some do not. Quote it when present, without making + // the Forge 50 launch depend on an obsolete argument. String legacyClassPathPrefix = '-DlegacyClassPath.file=' int legacyClassPathStart = text.indexOf(legacyClassPathPrefix) - int legacyClassPathEnd = text.indexOf(' -DignoreList=', legacyClassPathStart) - if (legacyClassPathStart < 0 || legacyClassPathEnd < 0) { - throw new GradleException("ForgeGradle omitted -DlegacyClassPath.file from ${launch.name}") - } - String xmlQuote = '"' - boolean legacyClassPathQuoted = legacyClassPathStart >= xmlQuote.length() - && text.substring(legacyClassPathStart - xmlQuote.length(), legacyClassPathStart) == xmlQuote - && legacyClassPathEnd >= xmlQuote.length() - && text.substring(legacyClassPathEnd - xmlQuote.length(), legacyClassPathEnd) == xmlQuote - if (!legacyClassPathQuoted) { - String beforeLegacyClassPath = text.substring(0, legacyClassPathStart) - String legacyClassPathArgument = text.substring(legacyClassPathStart, legacyClassPathEnd) - String afterLegacyClassPath = text.substring(legacyClassPathEnd) - text = beforeLegacyClassPath + xmlQuote + legacyClassPathArgument + xmlQuote + afterLegacyClassPath + if (legacyClassPathStart >= 0) { + int legacyClassPathEnd = text.indexOf(' -DignoreList=', legacyClassPathStart) + if (legacyClassPathEnd < 0) { + throw new GradleException("ForgeGradle generated an unterminated -DlegacyClassPath.file in ${launch.name}") + } + String xmlQuote = '"' + boolean legacyClassPathQuoted = legacyClassPathStart >= xmlQuote.length() + && text.substring(legacyClassPathStart - xmlQuote.length(), legacyClassPathStart) == xmlQuote + && legacyClassPathEnd >= xmlQuote.length() + && text.substring(legacyClassPathEnd - xmlQuote.length(), legacyClassPathEnd) == xmlQuote + if (!legacyClassPathQuoted) { + String beforeLegacyClassPath = text.substring(0, legacyClassPathStart) + String legacyClassPathArgument = text.substring(legacyClassPathStart, legacyClassPathEnd) + String afterLegacyClassPath = text.substring(legacyClassPathEnd) + text = beforeLegacyClassPath + xmlQuote + legacyClassPathArgument + xmlQuote + afterLegacyClassPath + } } if (!text.contains('ATTR_EXCLUDE_TEST_CODE')) { text = text.replace('', @@ -1079,7 +1169,7 @@ tasks.register('syncForge47EclipseLaunches') { tasks.register('verifyEclipseProductionClasspath') { group = 'verification' - dependsOn tasks.named('syncForge47EclipseLaunches') + dependsOn tasks.named('syncForge50EclipseLaunches') doLast { File classpath = file('.classpath') if (!classpath.isFile()) throw new GradleException('Eclipse .classpath was not generated') @@ -1098,6 +1188,12 @@ tasks.register('verifyEclipseProductionClasspath') { } String cp = classpath.getText('UTF-8') def classpathXml = new XmlSlurper(false, false).parse(classpath) + def sourcePaths = classpathXml.classpathentry.findAll { it.@kind.text() == 'src' } + .collect { it.@path.text() } + if (sourcePaths.contains('src/main/resources') + || !sourcePaths.contains('build/resources/main')) { + throw new GradleException('Eclipse must use processed production resources, not raw src/main/resources') + } classpathXml.classpathentry.each { entry -> String path = entry.@path.text() boolean testSource = path.replace('\\', '/').startsWith('src/test/') @@ -1126,17 +1222,23 @@ tasks.register('verifyEclipseProductionClasspath') { String mainOutput = new File(projectDir, 'bin/main').absolutePath String expectedModClasses = "mineralogy%%${mainOutput}" 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} "")) { throw new GradleException("Eclipse launch does not quote its --${flag} path: ${name}") } } - if (!launch.contains('"-DlegacyClassPath.file=') - || !launch.contains('minecraft_classpath.txt" -DignoreList=')) { + if (launch.contains('-DlegacyClassPath.file=') + && (!launch.contains('"-DlegacyClassPath.file=') + || !launch.contains('minecraft_classpath.txt" -DignoreList='))) { throw new GradleException("Eclipse launch does not quote -DlegacyClassPath.file: ${name}") } + if (launch.contains('value=""') || launch.contains('${MC_VERSION}') + || launch.contains('${') || launch.contains('src/test') + || launch.contains('bin/test')) { + throw new GradleException("Eclipse launch contains an unresolved, empty, or test-only value: ${name}") + } } ['README.md', 'PLAYER_GUIDE.md', 'DEVELOPER_GUIDE.md', 'CONTENT_CONFIG.md', 'PROVIDER.md', 'VERSIONS.md', 'examples/mineralogy-provider.json'].each { name -> @@ -1161,28 +1263,29 @@ tasks.register('verifyEclipseProductionClasspath') { throw new GradleException('Eclipse output contains stale or unexpanded mods.toml metadata') } String eclipseMetadata = eclipseModsToml.getText('UTF-8') - if (eclipseMetadata.contains('${') || !eclipseMetadata.contains('version="6.1.1.120011"')) { + if (eclipseMetadata.contains('${') || !eclipseMetadata.contains('version="6.1.1.120061"')) { throw new GradleException('Eclipse output contains unresolved or invalid Mineralogy version metadata') } } } tasks.matching { it.name == 'genEclipseRuns' }.configureEach { - finalizedBy tasks.named('syncForge47EclipseLaunches') + finalizedBy tasks.named('syncForge50EclipseLaunches') } tasks.register('isolateEclipseProductionRuns') { group = 'ide' dependsOn tasks.named('genEclipseRuns') - dependsOn tasks.named('syncForge47EclipseLaunches') + dependsOn tasks.named('syncForge50EclipseLaunches') } tasks.matching { it.name == 'eclipse' }.configureEach { - finalizedBy tasks.named('syncForge47EclipseLaunches') + finalizedBy tasks.named('syncForge50EclipseLaunches') } tasks.named('check') { dependsOn tasks.named('verifyReleaseDependencies') dependsOn tasks.named('verifyMavenCoordinates') dependsOn tasks.named('verifyOilCompatibilityFixtureIsolation') + dependsOn tasks.named('compileRecipeIntegrationFixture') } diff --git a/ci-fixtures/tools/README.md b/ci-fixtures/tools/README.md index 5cb98ca6f..e0ca8f3be 100644 --- a/ci-fixtures/tools/README.md +++ b/ci-fixtures/tools/README.md @@ -2,7 +2,7 @@ This directory contains a build-only derivative of MinecraftForge's MinecraftMavenizer `0.5.21`. It is used only while ForgeGradle prepares the -exact Forge `1.20.1-47.4.10` development dependency and is excluded from every +exact Forge `1.20.6-50.2.0` development dependency and is excluded from every OreSpawn publication artifact. ## Provenance and licence @@ -21,16 +21,14 @@ declaration and one accessor in that record. Missing, partial, duplicate or ambiguous states fail preparation. Targets without an explicit rule set are left unchanged. -For Forge `1.20.1-47.4.10`, the manifest removes the eight explicit accessors -that duplicate compiler-generated record accessors in `Holder.Direct`, -`OptionInstance` and `MemoryCondition`. The implicit record methods have the -same public contract. A marker beside Mavenizer's output records the target, -manifest SHA-256 and applied rule IDs. Reprocessing already-patched sources is -validated and idempotent. +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; OreSpawn -and Minecraft 1.20.1 continue to compile for Java 17. +and Minecraft 1.20.6 continue to compile for Java 21. ## Rebuild diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar index 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/CONTENT_CONFIG.md b/docs/CONTENT_CONFIG.md index 079a032df..8e7bc553c 100644 --- a/docs/CONTENT_CONFIG.md +++ b/docs/CONTENT_CONFIG.md @@ -71,7 +71,7 @@ as levers, pistons, dispensers, droppers, and brewing stands. Setting it to and stone-crafting recipes while restoring their target-native ingredients. Rocks remain `stone`, retain their material-specific tags, and use exact Mineralogy slab, stair, and wall recipes. Chert and pumice remain historical -unconditional cobblestone equivalents in tag-backed recipes. The three 1.20.1 +unconditional cobblestone equivalents in tag-backed recipes. The three 1.20.6 armor-trim template duplication recipes restore exact vanilla cobblestone when the option is disabled, matching their native definitions. diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index 7b64dfa69..0a735834f 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -38,9 +38,9 @@ families additionally use `cobblestone`; chert and pumice always retain that identity. Gypsum, chalk, rock salt, and both rock salt lamps retain their specialty aliases. -Minecraft 1.20.1's `minecraft:stone_crafting_materials` and +Minecraft 1.20.6's `minecraft:stone_crafting_materials` and `minecraft:stone_tool_materials` item tags include `#forge:cobblestone`, so -enabled Mineralogy rocks work in native tool recipes. Forge 47 exposes +enabled Mineralogy rocks work in native tool recipes. Forge 50 exposes immutable tag snapshots; Mineralogy rebuilds only the block and item tag membership after initial tag loading and every data reload, preserves other mods' members, updates the exact tag instances retained by parsed recipes, @@ -50,18 +50,18 @@ tool tags are updated alongside the direct Forge tag. Sixteen established vanilla recipes and their advancements use conditional JSON overrides for the complete exact-cobblestone, stone-crafting-material, and stone-tool-material contracts. Enabled branches use stable Mineralogy union -tags; disabled branches restore the target-native ingredients. Forge 47's +tags; disabled branches restore the target-native ingredients. Forge 50's already-resolved nested tags do not observe a replacement tag collection, so Mineralogy also mutates retained tag instances rather than swapping the collection. -Minecraft 1.20.1 adds three more configurable recipes: coast, sentry, and vex +Minecraft 1.20.6 retains three additional configurable recipes: coast, sentry, and vex armor-trim template duplication. Enabled branches use the Mineralogy cobblestone union; disabled branches preserve the recipes' exact vanilla cobblestone ingredient. Their vanilla advancements are intentionally untouched because those recipes unlock from owning the template, not from cobblestone. -Minecraft 1.20.1 also owns andesite, basalt, diorite, granite, tuff, and several +Minecraft 1.20.6 also owns andesite, basalt, diorite, granite, tuff, and several matching finishes. Mineralogy's family tags include both native and retained legacy identities. Four `data/minecraft/recipes/polished_*.json` overrides move the native polished-block route from 2x2 crafting to one exact native block plus @@ -80,7 +80,7 @@ Do not broaden vanilla slab, stair, or wall recipes. Where Minecraft already owns a matching form (raw and polished andesite/diorite/granite slabs and stairs, plus their raw walls), the Mineralogy-output recipe keeps an exact legacy Mineralogy input except for the deliberate slab overrides below. Basalt -and tuff have no native construction forms in 1.20.1, so their safe family tags +and tuff have no native construction forms in 1.20.6, so their safe family tags feed Mineralogy slabs, stairs, and walls. Polished andesite/diorite/granite have no native walls, so those three Mineralogy wall recipes may also accept the matching family tag. @@ -98,7 +98,7 @@ material and finish so basalt cannot produce a different rock's slab or wall. ## Crafting Data -All Mineralogy recipes are native Minecraft/Forge 1.20.1 JSON under +All Mineralogy recipes are native Minecraft/Forge 1.20.6 JSON under `data/mineralogy/recipes/`. Run `scripts/generate-recipes.ps1` after changing the recipe matrix; it generates the 27 stone families and global recipes, the native slab/stonecutting overrides and compatibility conversions, and the four @@ -108,7 +108,7 @@ advancement with the same Forge conditions and the same exact-item or family-tag material predicate as the recipe. Unlocks use direct inventory ingredients instead of listening to other recipe unlocks, which would recursively reveal an entire construction tree. Polishing uses Minecraft -1.20.1's advancement requirements matrix to require the matching source plus +1.20.6's advancement requirements matrix to require the matching source plus accepted sand; manually crafting a recipe is the target-native fallback for Forge's delayed crafting-output inventory trigger. Rock-furnace advancements use the matching slab-family tag as their sole material criterion. They @@ -135,7 +135,7 @@ The legacy `GENERATE_*` flags can remove registrations on the next start. The new issue-121 switches only change creative visibility and Mineralogy-owned recipes, so existing content remains loadable. -Forge 47 converts pre-flattening chunks lazily. The coremod expands Minecraft's +Forge 50 converts pre-flattening chunks lazily. The coremod expands Minecraft's fixed legacy state tables before conversion, and the selected-world hook installs the complete saved block mapping before Mojang's data fixer. It reinstalls that mapping after the client enumerates other old saves, normalizes @@ -148,11 +148,11 @@ reobfuscated jar; a development launch alone cannot prove this path. ## Building -The build uses ForgeGradle 7.0.34 and the Gradle 9.6.1 wrapper on Java 17, -while an exact Java 17 toolchain compiles production and test bytecode: +The build uses ForgeGradle 7.0.34 and the Gradle 9.6.1 wrapper on Java 21, +while an exact Java 21 toolchain compiles production and test bytecode: ```powershell -$env:JAVA_HOME='path-to-a-Java-17-jdk' +$env:JAVA_HOME='path-to-a-Java-21-jdk' $env:GRADLE_USER_HOME='D:\MinecraftMineralogy\.gradle-verify-cache' .\gradlew.bat clean check build javadoc verifyReleaseConfiguration verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums --no-daemon .\gradlew.bat genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath --no-daemon @@ -164,5 +164,5 @@ OreSpawn in a launcher-like Forge installation. The normal jar packages this guide under `META-INF/mineralogy/docs/`. The complete release version is `Major.Minor.Bug.Target`; see -[Mineralogy Versioning](VERSIONS.md). This branch validates target `120011` -for Minecraft 1.20.1 Forge and does not append CI build numbers. +[Mineralogy Versioning](VERSIONS.md). This branch validates target `120061` +for Minecraft 1.20.6 Forge and does not append CI build numbers. diff --git a/docs/PLAYER_GUIDE.md b/docs/PLAYER_GUIDE.md index 4cef90506..d5650afd9 100644 --- a/docs/PLAYER_GUIDE.md +++ b/docs/PLAYER_GUIDE.md @@ -2,8 +2,8 @@ ## Installing -Mineralogy 6 needs Minecraft 1.20.1, Forge 47.4.10, and OreSpawn -4.0.16.120011. +Mineralogy 6 needs Minecraft 1.20.6, Forge 50.2.0, and OreSpawn +4.0.16.120061. Install matching Mineralogy and OreSpawn jars on both clients and servers. Do not open a world containing Mineralogy blocks without Mineralogy installed. @@ -19,7 +19,7 @@ Cyano/`LEGACY` engine with their established family order and layer settings. It does not silently convert old terrain to Stable Layers. Back up an important world before changing its profile or upgrading mods. -On the first 1.20.1 start, Mineralogy recognizes the old saved registry and +On the first 1.20.6 start, Mineralogy recognizes the old saved registry and protects existing Overworld chunks while Minecraft converts them to flattened block states. Rock furnaces are converted when their chunk is first loaded; their inventory and cooking progress are retained. Old vanilla tile IDs are @@ -84,7 +84,7 @@ Its **Rock Settings** screen provides four altitude controls: - **Minimum Y** (`min_y`) and **Maximum Y** (`max_y`) are inclusive hard limits. The rock cannot replace terrain outside them. -Minecraft 1.20.1 accepts Y `-64` through `319`; Depth Spread accepts `1` through +Minecraft 1.20.6 accepts Y `-64` through `319`; Depth Spread accepts `1` through `512`. The saved fields are independent of the rock's geological family, overall weight, and geome weights, which also affect where it is selected. @@ -112,7 +112,7 @@ terrain replacement through each dimension's `host_blocks` and `host_tags`. The packaged Mineralogy profile initially uses `minecraft:stone` and `minecraft:deepslate` in the Overworld. -The terrain-host list is not exposed by OreSpawn's 1.20.1 graphical editor. Stop +The terrain-host list is not exposed by OreSpawn's 1.20.6 graphical editor. Stop Minecraft or the server before editing the JSON. For defaults inherited by worlds created afterward, edit: @@ -146,11 +146,11 @@ each natural terrain block that Mineralogy rock may replace: ``` Use `host_tags` when an OreSpawn/pack-provided group is more appropriate; on -Minecraft 1.20.1 these resolve through target-native block tags. Exact +Minecraft 1.20.6 these resolve through target-native block tags. Exact `host_blocks` entries are the clearest choice for one modded stone. -Minecraft 1.20.1 matches a `host_blocks` entry by flattened block registry +Minecraft 1.20.6 matches a `host_blocks` entry by flattened block registry identity. Add only natural base-terrain blocks, not machines, containers, or construction blocks. Restart after editing. The change affects only chunks generated afterward; @@ -159,11 +159,11 @@ OreSpawn never retro-generates Mineralogy rock strata into existing chunks. ### Enabling Mineralogy Geology In Another Dimension OreSpawn can apply Mineralogy rocks to a stone-based mod dimension without a -separate Mineralogy dimension option. Minecraft 1.20.1 uses the dimension +separate Mineralogy dimension option. Minecraft 1.20.6 uses the dimension type's registered ID. For example, use `examplemod:moon` when that is the ID documented by the installed dimension mod. -The 1.20.1 graphical editor does not expose terrain-dimension or rock-membership +The 1.20.6 graphical editor does not expose terrain-dimension or rock-membership fields. Stop Minecraft or the server and edit the appropriate OreSpawn JSON: `config/orespawn-worldgen.json` for defaults inherited by future worlds, or `/serverconfig/orespawn-worldgen.json` for an established world. diff --git a/docs/PROVIDER.md b/docs/PROVIDER.md index f0cf321bb..12643089b 100644 --- a/docs/PROVIDER.md +++ b/docs/PROVIDER.md @@ -14,7 +14,7 @@ The exact bytes from the installed build are exported as - Provider schema 4, mod ID `mineralogy`, and provider revision 3. - 32 enabled rock rules across the four geological families. - Sulfur, phosphorous, and nitrate ore rules. -- Minecraft 1.20.1 heights `-64` through `319` and Overworld-only terrain defaults. +- Minecraft 1.20.6 heights `-64` through `319` and Overworld-only terrain defaults. - Minecraft blocks for granite, diorite, andesite, basalt, and tuff. Worldgen aliases map the five matching historical Mineralogy rock IDs to their native outputs, while all historical Mineralogy blocks remain registered for old @@ -82,7 +82,7 @@ that same dimension ID to each desired rock rule's `dimensions` array. A rock without `dimensions` is Overworld-only. A configured custom dimension is disabled during baking when no valid rock rules include it. -Minecraft 1.20.1 uses the registered dimension-type ID, such as +Minecraft 1.20.6 uses the registered dimension-type ID, such as `examplemod:moon`; consult the dimension mod's documentation for its exact ID. Rock membership makes different stone sets possible per dimension. To use different altitude settings for the same output block, define unique rock rule @@ -90,7 +90,7 @@ IDs with different `depth_peak`, `depth_spread`, `min_y`, or `max_y` values and non-overlapping dimension lists. Duplicate output states within one dimension are rejected. -The 1.20.1 editor does not expose terrain-dimension or rock-membership fields, so +The 1.20.6 editor does not expose terrain-dimension or rock-membership fields, so players edit the stopped world's saved profile and pack authors may provide global defaults or a complete provider override. Changes affect newly generated chunks only. @@ -112,6 +112,6 @@ intends to replace the whole packaged Mineralogy provider; it is unnecessary for an ordinary per-world host-list change and does not rewrite established world profiles. -On Minecraft 1.20.1, terrain hosts are baked as flattened block identities. +On Minecraft 1.20.6, terrain hosts are baked as flattened block identities. Changes affect only newly generated chunks because Mineralogy strata are never retro-generated. diff --git a/docs/README.md b/docs/README.md index fee8fdec0..6ee07d368 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ # Mineralogy Guide -Mineralogy 6 for Minecraft 1.20.1 supplies rock, mineral, construction, and +Mineralogy 6 for Minecraft 1.20.6 supplies rock, mineral, construction, and crude-oil content to OreSpawn 4. OreSpawn is the only terrain and deposit engine. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 2e200e9f3..55a096520 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -13,10 +13,10 @@ The first three components are the **functional version**. Mineralogy `6.1.1` means major generation 6, minor release 1, and bug revision 1. The fourth component identifies the target build. The complete version for -this Minecraft 1.20.1 Forge release is therefore: +this Minecraft 1.20.6 Forge release is therefore: ```text -6.1.1.120011 +6.1.1.120061 ``` This expanded numeric form is compatible with Maven version ordering, but it @@ -25,7 +25,7 @@ components. The release tag is exactly the complete four-component version, with no redundant Minecraft-version prefix. For this branch the tag is therefore -`6.1.1.120011`, not `1.20.1-6.1.1.120011`. The Target already makes tags unique +`6.1.1.120061`, not `1.20.6-6.1.1.120061`. The Target already makes tags unique across Minecraft versions and loaders. ## Reading the target component @@ -55,12 +55,12 @@ minor digits, and all remaining digits for the Minecraft major version. | 1.18.2 | Forge | `118021` | `6.1.0.118021` | | 1.19.4 | Forge | `119041` | `6.1.1.119041` | | 1.20.1 | Forge | `120011` | `6.1.1.120011` | -| 1.20.6 | Forge | `120061` | `6.0.0.120061` | +| 1.20.6 | Forge | `120061` | `6.1.1.120061` | | 1.21.11 | Forge | `121111` | `6.0.0.121111` | | 26.2 | Forge | `2602001` | `6.0.0.2602001` | | 26.2 | NeoForge | `2602002` | `6.0.0.2602002` | -The 1.20.1 row records this branch's current release. The other rows illustrate +The 1.20.6 row records this branch's current release. The other rows illustrate target encoding or earlier releases; they do not claim that later Minecraft targets already contain the same functional changes. @@ -92,8 +92,8 @@ When Major changes, Minor and Bug reset to zero. When Minor changes, Bug resets to zero. The target for the actual build is then appended: ```text -6.1.1.120011 -> 6.2.0.120011 -6.2.4.120011 -> 7.0.0.120011 +6.1.1.120061 -> 6.2.0.120061 +6.2.4.120061 -> 7.0.0.120061 ``` ## Bug version @@ -121,6 +121,7 @@ Minecraft 1.17.1 / Forge / Mineralogy 6.1.0.117011 Minecraft 1.18.2 / Forge / Mineralogy 6.1.0.118021 Minecraft 1.19.4 / Forge / Mineralogy 6.1.1.119041 Minecraft 1.20.1 / Forge / Mineralogy 6.1.1.120011 +Minecraft 1.20.6 / Forge / Mineralogy 6.1.1.120061 ``` Minecraft and loader APIs may require different internal code without changing @@ -152,8 +153,8 @@ excluding Mineralogy 7. Minecraft and loader metadata still decide whether a particular jar can load on the current game. Mineralogy 6 also requires OreSpawn `[4.0.6,5.0.0)`. OreSpawn uses the same -target calculation, so the matching Minecraft 1.20.1 Forge release used for -this candidate is `4.0.16.120011`. The dependency range deliberately describes the supported +target calculation, so the matching Minecraft 1.20.6 Forge release used for +this candidate is `4.0.16.120061`. The dependency range deliberately describes the supported functional OreSpawn generation; Forge still prevents jars for another Minecraft target from loading together. @@ -166,7 +167,7 @@ feature generation, not the exact jar. The Gradle build reads the complete version from `mod_version`, verifies that it has four numeric components, and checks that its Target matches the declared Minecraft version and Forge loader. CI build numbers are not appended. For this -branch, published metadata and artifacts therefore use `6.1.1.120011`. +branch, published metadata and artifacts therefore use `6.1.1.120061`. Every release note should state: diff --git a/gradle.properties b/gradle.properties index 873acf8c3..7e3cde492 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,25 +7,26 @@ org.gradle.caching=true org.gradle.parallel=false net.minecraftforge.gradle.merge-source-sets=false -mod_version=6.1.1.120011 +mod_version=6.1.1.120061 mod_group=zone.moddev.mc.mineralogy # Release metadata consumed by the generic dispatcher. -minecraft_version=1.20.1 +minecraft_version=1.20.6 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 +java_setup_version=21.0.7+6.0.LTS +gradle_java_version=21 curseforge_project_id=240974 -mc_version=1.20.1 -forge_version=47.4.10 +mc_version=1.20.6 +forge_version=50.2.0 mcp_mappings_channel=official -mcp_mappings_version=1.20.1 -mcp_version=20230612.114412 +mcp_mappings_version=1.20.6 +mcp_version=20240429.135109 -orespawn_version=4.0.16.120011 +orespawn_version=4.0.16.120061 orespawn_curse_project_id=245586 -orespawn_curse_file_id=8784008 -orespawn_sha256=EE0CE2A00CD883CA270FFE900016D42633B03D50E9AC65FD95797822D95C3A22 +orespawn_curse_file_id=8786031 +orespawn_sha256=D86A14957B9996DDA0465C413C60811B7473EF327FC16E95266B522F06CBE806 diff --git a/scripts/generate-locales.ps1 b/scripts/generate-locales.ps1 index cd145f935..895182a60 100644 --- a/scripts/generate-locales.ps1 +++ b/scripts/generate-locales.ps1 @@ -53,4 +53,4 @@ $actual = @(Get-ChildItem -LiteralPath $targetRoot -Filter '*.json' | Sort-Objec if ($actual.Count -ne 17) { throw "Expected exactly 17 generated locale files, found $($actual.Count)" } -Write-Output 'Generated 17 reviewed Mineralogy 1.20.1 JSON locales with 938 ordered keys each.' +Write-Output 'Generated 17 reviewed Mineralogy 1.20.6 JSON locales with 938 ordered keys each.' diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 index 3aaa18117..c69567570 100644 --- a/scripts/generate-recipes.ps1 +++ b/scripts/generate-recipes.ps1 @@ -27,7 +27,7 @@ $colors = @( 'gray', 'pink', 'lime', 'yellow', 'light_blue', 'magenta', 'orange', 'white' ) -# Minecraft owns these full-block identities in 1.20.1. Mineralogy keeps its +# Minecraft owns these full-block identities in 1.20.6. Mineralogy keeps its # legacy blocks registered, but recipes may accept either identity where doing # so cannot compete with a native recipe. $nativeFullBlocks = @{ @@ -69,6 +69,13 @@ function NotCondition([System.Collections.IDictionary] $condition) { return [ordered]@{ type = 'forge:not'; value = $condition } } +function CombinedCondition([object[]] $conditions) { + $present = @($conditions | Where-Object { $null -ne $_ }) + if ($present.Count -eq 0) { return $null } + if ($present.Count -eq 1) { return $present[0] } + return [ordered]@{ type = 'forge:and'; values = $present } +} + function ItemTagNotEmptyCondition([string] $tag) { return [ordered]@{ type = 'forge:not' @@ -99,25 +106,25 @@ function ItemIngredient([string] $item, [object] $data = $null) { function AdvancementPredicate([object] $ingredient) { if ($ingredient -is [System.Collections.IDictionary]) { if ($ingredient.Contains('item')) { - return [ordered]@{ items = @([string]$ingredient['item']) } + return [ordered]@{ items = [string]$ingredient['item'] } } if ($ingredient.Contains('tag')) { - return [ordered]@{ tag = [string]$ingredient['tag'] } + return [ordered]@{ items = "#$([string]$ingredient['tag'])" } } if ($ingredient.Contains('items')) { - return [ordered]@{ items = @($ingredient['items']) } + return [ordered]@{ items = $ingredient['items'] } } } if ($null -ne $ingredient.PSObject.Properties['item']) { - return [ordered]@{ items = @([string]$ingredient.item) } + return [ordered]@{ items = [string]$ingredient.item } } if ($null -ne $ingredient.PSObject.Properties['tag']) { - return [ordered]@{ tag = [string]$ingredient.tag } + return [ordered]@{ items = "#$([string]$ingredient.tag)" } } if ($null -ne $ingredient.PSObject.Properties['items']) { - return [ordered]@{ items = @($ingredient.items) } + return [ordered]@{ items = $ingredient.items } } - throw "Cannot convert recipe ingredient into a Minecraft 1.20.1 advancement predicate" + throw "Cannot convert recipe ingredient into a Minecraft 1.20.6 advancement predicate" } function OreIngredient([string] $ore) { @@ -143,7 +150,7 @@ function OreIngredient([string] $ore) { $finish = if ($Matches[2]) { '/' + (Convert-CamelToSnake $Matches[2]) } else { '' } return [ordered]@{ tag = "mineralogy:slabs/$family$finish" } } - throw "No Minecraft 1.20.1 tag mapping for legacy OreDictionary key $ore" + throw "No Minecraft 1.20.6 tag mapping for legacy OreDictionary key $ore" } function Convert-CamelToSnake([string] $value) { @@ -151,11 +158,11 @@ function Convert-CamelToSnake([string] $value) { } function RecipeResult([string] $item, [int] $count) { - return [ordered]@{ item = $item; count = $count } + return [ordered]@{ id = $item; count = $count } } function VanillaResult([string] $item, [int] $count = 1) { - $result = [ordered]@{ item = $item } + $result = [ordered]@{ id = $item } if ($count -ne 1) { $result.count = $count } return $result } @@ -245,8 +252,7 @@ function VanillaStonecuttingRecipe( return [ordered]@{ type = 'minecraft:stonecutting' ingredient = $ingredient - result = $result - count = $count + result = VanillaResult $result $count } } @@ -259,8 +265,8 @@ function Write-ConditionalMinecraftRecipe( Write-Json (Join-Path $minecraftRecipeRoot "$name.json") ([ordered]@{ type = 'forge:conditional' recipes = @( - [ordered]@{ conditions = @($condition); recipe = $enabledRecipe }, - [ordered]@{ conditions = @((NotCondition $condition)); recipe = $fallbackRecipe } + [ordered]@{ 'forge:condition' = $condition; recipe = $enabledRecipe }, + [ordered]@{ 'forge:condition' = (NotCondition $condition); recipe = $fallbackRecipe } ) }) } @@ -434,15 +440,17 @@ function Write-ShapedRecipe( [object[]] $conditions ) { if ($type.StartsWith('forge:ore_')) { $type = 'minecraft:crafting_shaped' } - Write-Recipe $name ([ordered]@{ - conditions = $conditions + $recipe = [ordered]@{ type = $type category = CraftingCategoryForResult $result pattern = $pattern key = $key result = RecipeResult $result $count show_notification = $true - }) + } + $condition = CombinedCondition $conditions + if ($null -ne $condition) { $recipe.Insert(0, 'forge:condition', $condition) } + Write-Recipe $name $recipe } function Write-ShapelessRecipe( @@ -454,13 +462,15 @@ function Write-ShapelessRecipe( [object[]] $conditions ) { if ($type.StartsWith('forge:ore_')) { $type = 'minecraft:crafting_shapeless' } - Write-Recipe $name ([ordered]@{ - conditions = $conditions + $recipe = [ordered]@{ type = $type category = CraftingCategoryForResult $result ingredients = $ingredients result = RecipeResult $result $count - }) + } + $condition = CombinedCondition $conditions + if ($null -ne $condition) { $recipe.Insert(0, 'forge:condition', $condition) } + Write-Recipe $name $recipe } function FamilyOreName([string] $prefix, [string] $family, [string] $suffix = '') { @@ -741,16 +751,6 @@ function Write-GlobalRecipes() { } } -function Write-Factories() { - $factories = [ordered]@{ - conditions = [ordered]@{ - config = 'zone.moddev.mc.mineralogy.recipe.ConfigConditionFactory' - } - } - Write-Json (Join-Path $recipeRoot '_factories.json') $factories - Write-Json (Join-Path (Split-Path -Parent $advancementRoot) '_factories.json') $factories -} - function Ensure-MissingRecipeAdvancements() { $recipeFiles = Get-ChildItem -LiteralPath $recipeRoot -Filter '*.json' | Where-Object { -not $_.Name.StartsWith('_') } @@ -783,8 +783,8 @@ function Ensure-MissingRecipeAdvancements() { $requirements = Get-UnlockRequirements $sandMode $generatedAdvancement = [ordered]@{} - if ($null -ne $recipe.conditions) { - $generatedAdvancement.conditions = @($recipe.conditions) + if ($null -ne $recipe.'forge:condition') { + $generatedAdvancement['forge:condition'] = $recipe.'forge:condition' } $generatedAdvancement.rewards = [ordered]@{ recipes = @("mineralogy:$recipeName") } $generatedAdvancement.criteria = $criteria @@ -843,8 +843,8 @@ function Synchronize-AdvancementConditions() { $requirements = Get-UnlockRequirements $sandMode $ordered = [ordered]@{} - if ($null -ne $recipe.conditions) { - $ordered.conditions = @($recipe.conditions) + if ($null -ne $recipe.'forge:condition') { + $ordered['forge:condition'] = $recipe.'forge:condition' } foreach ($property in $advancement.PSObject.Properties) { if ($property.Name -eq 'criteria') { @@ -853,7 +853,7 @@ function Synchronize-AdvancementConditions() { elseif ($property.Name -eq 'requirements') { $ordered[$property.Name] = $requirements } - elseif ($property.Name -ne 'conditions') { + elseif ($property.Name -ne 'forge:condition') { $ordered[$property.Name] = $property.Value } } @@ -882,7 +882,12 @@ function Prepare-TargetDirectories() { } foreach ($property in $recipe.PSObject.Properties) { if ($property.Name -notin @('type', 'category')) { - $orderedRecipe[$property.Name] = $property.Value + if ($property.Name -eq 'result' -and $property.Value -is [string]) { + $orderedRecipe[$property.Name] = [ordered]@{ id = [string]$property.Value } + } + else { + $orderedRecipe[$property.Name] = $property.Value + } } } Write-Json $file.FullName $orderedRecipe @@ -981,18 +986,25 @@ function Write-ConditionalMinecraftAdvancement( New-Item -ItemType Directory -Force -Path $directory | Out-Null Write-Json (Join-Path $directory "$recipeName.json") ([ordered]@{ advancements = @( - [ordered]@{ - conditions = @($condition) - advancement = VanillaRecipeAdvancement $recipeName $criterionName $enabledIngredient - }, - [ordered]@{ - conditions = @((NotCondition $condition)) - advancement = VanillaRecipeAdvancement $recipeName $criterionName $fallbackIngredient - } + (Add-ConditionToAdvancement $condition ` + (VanillaRecipeAdvancement $recipeName $criterionName $enabledIngredient)), + (Add-ConditionToAdvancement (NotCondition $condition) ` + (VanillaRecipeAdvancement $recipeName $criterionName $fallbackIngredient)) ) }) } +function Add-ConditionToAdvancement( + [System.Collections.IDictionary] $condition, + [System.Collections.IDictionary] $advancement +) { + $result = [ordered]@{ 'forge:condition' = $condition } + foreach ($entry in $advancement.GetEnumerator()) { + $result[$entry.Key] = $entry.Value + } + return $result +} + function Write-CobblestoneRecipeOverrides() { $condition = ConfigCondition 'COBBLESTONE_EQUIVILENT' $enabledCobblestone = [ordered]@{ tag = 'mineralogy:cobblestone_equivalents' } @@ -1246,4 +1258,4 @@ $advancementCount = Synchronize-AdvancementConditions if ($advancementCount -ne $expectedTargetRecipeCount) { throw "Expected $expectedTargetRecipeCount recipe advancements, found $advancementCount" } -Write-Output "Generated $expectedRecipeCount crafting recipe JSON files, retained 28 target-native smelting recipes, created $createdAdvancements missing recipe advancements, and conditioned $advancementCount Minecraft 1.20.1 recipe advancements." +Write-Output "Generated $expectedRecipeCount crafting recipe JSON files, retained 28 target-native smelting recipes, created $createdAdvancements missing recipe advancements, and conditioned $advancementCount Minecraft 1.20.6 recipe advancements." diff --git a/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java b/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java index f3f55716f..441181da9 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java +++ b/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java @@ -31,17 +31,17 @@ private static String getVersion() { return version == null ? "DEV" : version; } - public Mineralogy() { + public Mineralogy(FMLJavaModLoadingContext loadingContext) { instance = this; + var modEventBus = loadingContext.getModEventBus(); MineralogyConfig.load(); LegacyMineralogy6ConfigMigrator.migrateGlobalConfig( MineralogyConfig.configFile().toAbsolutePath().getParent(), LOGGER); LegacyOreConfigMigrator.migrate(MineralogyConfig.configFile(), LOGGER); - MineralogyConfig.registerRecipeConditions(); - MineralogyConfig.registerAdvancementPredicates(); + MineralogyConfig.registerRecipeConditions(modEventBus); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); - MineralogyFluids.register(FMLJavaModLoadingContext.get().getModEventBus()); + modEventBus.addListener(this::setup); + MineralogyFluids.register(modEventBus); MinecraftForge.EVENT_BUS.addListener(EventPriority.HIGHEST, LegacyWorldDataHook::onServerAboutToStart); MinecraftForge.EVENT_BUS.addListener(CobblestoneTagPolicy::onTagsUpdated); diff --git a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java index 4adcdfccc..feab1d852 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java +++ b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java @@ -14,20 +14,17 @@ import java.util.Map; import java.util.function.BooleanSupplier; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; +import com.mojang.serialization.Codec; +import com.mojang.serialization.DynamicOps; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.minecraft.advancements.critereon.ItemPredicate; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.util.GsonHelper; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.loading.FMLPaths; +import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; /** @@ -39,7 +36,8 @@ public final class MineralogyConfig { public static final String FILE_NAME = "mineralogy-common.toml"; private static final ResourceLocation CONFIG_CONDITION_ID = - new ResourceLocation(Mineralogy.MODID, "config"); + ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "config"); + private static DeferredRegister> conditionCodecs; private static boolean smeltableGravel = true; private static boolean dropCobblestone; @@ -69,7 +67,6 @@ public final class MineralogyConfig { private static CreativeTabPolicy creativeTabPolicy = new CreativeTabPolicy(false); private static Path configFile; private static boolean recipeConditionsRegistered; - private static boolean advancementPredicatesRegistered; private MineralogyConfig() { } @@ -235,32 +232,17 @@ private static void append(StringBuilder out, String key, boolean value) { out.append('\t').append(key).append(" = ").append(value).append('\n'); } - public static void registerRecipeConditions() { + public static void registerRecipeConditions(IEventBus modEventBus) { if (!recipeConditionsRegistered) { - CraftingHelper.register(new ConfigConditionSerializer()); + conditionCodecs = DeferredRegister.create( + ForgeRegistries.Keys.CONDITION_SERIALIZERS, + Mineralogy.MODID); + conditionCodecs.register(CONFIG_CONDITION_ID.getPath(), () -> ConfigCondition.CODEC); + conditionCodecs.register(modEventBus); recipeConditionsRegistered = true; } } - public static void registerAdvancementPredicates() { - if (!advancementPredicatesRegistered) { - ItemPredicate.register(new ResourceLocation(Mineralogy.MODID, "config_item"), - MineralogyConfig::configItemPredicate); - advancementPredicatesRegistered = true; - } - } - - private static ItemPredicate configItemPredicate(JsonObject json) { - List flags = new ArrayList<>(); - if (json.has("flags")) { - JsonArray array = GsonHelper.getAsJsonArray(json, "flags"); - for (JsonElement flag : array) flags.add(configFlagCondition(GsonHelper.convertToString(flag, "flag"))); - } else { - flags.add(configFlagCondition(GsonHelper.getAsString(json, "flag"))); - } - return new ConfigItemPredicate(flags, new ResourceLocation(GsonHelper.getAsString(json, "item"))); - } - private static BooleanSupplier configFlagCondition(String flag) { switch (flag) { case "SMELTABLE_GRAVEL": return () -> smeltableGravel; @@ -333,42 +315,19 @@ public static boolean isCreativeVisible(String name) { return !"mineral_fertilizer".equals(name) || contentPolicy.mineralFertilizerEnabled(); } - private static final class ConfigCondition implements ICondition { + static final class ConfigCondition implements ICondition { + static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group(Codec.STRING.fieldOf("flag").forGetter(condition -> condition.flagName)) + .apply(instance, ConfigCondition::new)); private final String flagName; private final BooleanSupplier flag; - private ConfigCondition(String flagName) { + ConfigCondition(String flagName) { this.flagName = flagName; this.flag = configFlagCondition(flagName); } - @Override public ResourceLocation getID() { return CONFIG_CONDITION_ID; } - @Override public boolean test(ICondition.IContext context) { return flag.getAsBoolean(); } - } - - private static final class ConfigConditionSerializer implements IConditionSerializer { - @Override public void write(JsonObject json, ConfigCondition value) { - json.addProperty("flag", value.flagName); - } - - @Override public ConfigCondition read(JsonObject json) { - return new ConfigCondition(GsonHelper.getAsString(json, "flag")); - } - - @Override public ResourceLocation getID() { return CONFIG_CONDITION_ID; } - } - - private static final class ConfigItemPredicate extends ItemPredicate { - private final List flags; - private final ResourceLocation itemName; - private ConfigItemPredicate(List flags, ResourceLocation itemName) { - this.flags = flags; - this.itemName = itemName; - } - @Override public boolean matches(ItemStack stack) { - for (BooleanSupplier flag : flags) if (!flag.getAsBoolean()) return false; - Item item = ForgeRegistries.ITEMS.getValue(itemName); - return item != null && stack.getItem() == item; - } + @Override public boolean test(ICondition.IContext context, DynamicOps ops) { return flag.getAsBoolean(); } + @Override public MapCodec codec() { return CODEC; } } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java index 70e77f1c9..812c656e6 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java @@ -24,7 +24,7 @@ public List getDrops(BlockState state, Builder builder) { return Collections.singletonList(new ItemStack(this)); } - Item dust = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, "chalk_dust")); + Item dust = ForgeRegistries.ITEMS.getValue(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "chalk_dust")); if (dust != null) { return Collections.singletonList(new ItemStack(dust, 4)); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java index 94d4a8df9..0c06c872f 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java @@ -7,13 +7,15 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.storage.loot.LootParams.Builder; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; +import net.minecraft.world.phys.HitResult; public class DoubleSlab extends Block implements NamedMineralogyBlock { private final Block drops; @@ -28,7 +30,7 @@ public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, Block drops, Block fullBlock, String name) { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance).sound(sound) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance).sound(sound) .requiresCorrectToolForDrops()); this.drops = drops; this.fullBlock = fullBlock; @@ -42,7 +44,8 @@ public String mineralogyRegistryPath() { } @Override - public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) { + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader world, BlockPos pos, + Player player) { return new ItemStack(drops); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java index e33b6f3b5..9eecb7b24 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java @@ -11,7 +11,7 @@ public class DryWall extends IronBarsBlock implements NamedMineralogyBlock { private final String registryPath; public DryWall(String color) { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.STONE).strength(0.75F, 1.0F).sound(SoundType.STONE) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.STONE).strength(0.75F, 1.0F).sound(SoundType.STONE) .requiresCorrectToolForDrops()); this.toolHardnessLevel = 0; this.registryPath = "drywall_" + color; diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java index a4c6dc5f3..f6ee174dd 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java @@ -27,7 +27,7 @@ public List getDrops(BlockState state, Builder builder) { return Collections.singletonList(new ItemStack(this)); } - Item dust = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, "gypsum_dust")); + Item dust = ForgeRegistries.ITEMS.getValue(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "gypsum_dust")); if (dust != null) { return Collections.singletonList(new ItemStack(dust, prng.nextInt(3) + 1)); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/MineralogyLiquidBlock.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/MineralogyLiquidBlock.java index 6a6cfeb26..f2a6c5561 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/MineralogyLiquidBlock.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/MineralogyLiquidBlock.java @@ -8,7 +8,7 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.tags.FluidTags; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; @@ -28,8 +28,8 @@ public MineralogyLiquidBlock(Supplier fluid, BlockBehavi } @Override - public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) { - return !getFluid().is(FluidTags.LAVA); + protected boolean isPathfindable(BlockState state, PathComputationType type) { + return !state.getFluidState().is(FluidTags.LAVA); } @Override @@ -58,7 +58,7 @@ public void neighborChanged(BlockState state, Level world, BlockPos pos, Block b } @Override - public ItemStack pickupBlock(LevelAccessor world, BlockPos pos, BlockState state) { + public ItemStack pickupBlock(Player player, LevelAccessor world, BlockPos pos, BlockState state) { if (state.getValue(LEVEL) == 0) { world.setBlock(pos, Blocks.AIR.defaultBlockState(), 11); return new ItemStack(getFluid().getBucket()); diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/Ore.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Ore.java index afed0313d..3b2dee3e4 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/Ore.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Ore.java @@ -27,7 +27,7 @@ public class Ore extends Block implements NamedMineralogyBlock { private final int pickLevel; public Ore(String name, String dropItemName, int minNumberDropped, int maxNumberDropped, int pickLevel) { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.STONE).strength(1.5F, 5.0F).sound(SoundType.STONE) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.STONE).strength(1.5F, 5.0F).sound(SoundType.STONE) .requiresCorrectToolForDrops()); this.registryPath = name; this.dropItemName = dropItemName; @@ -48,7 +48,7 @@ public int getExpDrop(BlockState state, LevelReader world, RandomSource random, } public ItemLike getItemDropped() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, dropItemName)); + Item item = ForgeRegistries.ITEMS.getValue(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, dropItemName)); return item == null ? this : item; } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java index 10a7367b3..e1079ba14 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java @@ -24,7 +24,7 @@ public class Rock extends Block implements NamedMineralogyBlock { public Rock(boolean isStoneEquivalent, float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name) { - super(BlockBehaviour.Properties.copy(Blocks.STONE).strength(hardness, blastResistance).sound(sound) + super(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).strength(hardness, blastResistance).sound(sound) .requiresCorrectToolForDrops()); this.registryPath = name; @@ -60,6 +60,6 @@ protected static boolean hasSilkTouch(Builder builder) { protected static int getFortuneLevel(Builder builder) { ItemStack tool = builder.getOptionalParameter(LootContextParams.TOOL); - return tool == null || tool.isEmpty() ? 0 : EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, tool); + return tool == null || tool.isEmpty() ? 0 : EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FORTUNE, tool); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java index f5fa0b3b1..ff1b06bb5 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java @@ -2,6 +2,7 @@ import java.util.Collections; import java.util.List; +import com.mojang.serialization.MapCodec; import zone.moddev.mc.mineralogy.Mineralogy; import zone.moddev.mc.mineralogy.init.TileEntities; @@ -23,6 +24,7 @@ import net.minecraft.world.Containers; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.ItemStack; +import net.minecraft.core.component.DataComponents; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; @@ -30,14 +32,15 @@ import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.InteractionResult; import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; import net.minecraft.world.level.block.Mirror; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Rotation; import net.minecraft.sounds.SoundSource; import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.Level; import net.minecraft.world.level.storage.loot.LootParams.Builder; import net.minecraftforge.registries.ForgeRegistries; @@ -53,7 +56,7 @@ public class RockFurnace extends BaseEntityBlock implements NamedMineralogyBlock public RockFurnace(float hardness, float blastResistance, int toolHardnessLevel, boolean burning, float burnModifier, String name) { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance) .sound(SoundType.STONE).lightLevel(state -> burning ? 14 : 0).requiresCorrectToolForDrops()); this.burning = burning; this.burnModifier = burnModifier; @@ -62,6 +65,11 @@ public RockFurnace(float hardness, float blastResistance, int toolHardnessLevel, this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.NORTH)); } + @Override + protected MapCodec codec() { + return MapCodec.unit(this); + } + @Override public String mineralogyRegistryPath() { return registryPath; @@ -79,7 +87,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { @Override public void setPlacedBy(Level world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) { - if (stack.hasCustomHoverName()) { + if (stack.has(DataComponents.CUSTOM_NAME)) { BlockEntity tileEntity = world.getBlockEntity(pos); if (tileEntity instanceof TileEntityRockFurnace) { ((TileEntityRockFurnace) tileEntity).setCustomInventoryName(stack.getHoverName()); @@ -88,8 +96,8 @@ public void setPlacedBy(Level world, BlockPos pos, BlockState state, LivingEntit } @Override - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, - InteractionHand hand, BlockHitResult hit) { + protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, + BlockHitResult hit) { if (world.isClientSide) { return InteractionResult.SUCCESS; } @@ -166,7 +174,8 @@ public int getAnalogOutputSignal(BlockState blockState, Level world, BlockPos po } @Override - public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) { + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader world, BlockPos pos, + Player player) { return new ItemStack(getUnlitBlock(state.getBlock())); } @@ -210,7 +219,7 @@ public BlockState rotate(BlockState state, Rotation rotation) { @Override public BlockState mirror(BlockState state, Mirror mirror) { - return state.rotate(mirror.getRotation(state.getValue(FACING))); + return rotate(state, mirror.getRotation(state.getValue(FACING))); } @Override @@ -239,7 +248,7 @@ private static Block getStateBlock(Block block, boolean active) { path = path.substring(4); } - Block stateBlock = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, path)); + Block stateBlock = ForgeRegistries.BLOCKS.getValue(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, path)); return stateBlock == null ? block : stateBlock; } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSalt.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSalt.java index 0678f15ac..79e673b72 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSalt.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSalt.java @@ -24,7 +24,7 @@ public List getDrops(BlockState state, Builder builder) { return Collections.singletonList(new ItemStack(this)); } - Item dust = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, "rock_salt_dust")); + Item dust = ForgeRegistries.ITEMS.getValue(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "rock_salt_dust")); if (dust != null) { return Collections.singletonList(new ItemStack(dust, 4)); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java index 916bc5ded..ca64129b2 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java @@ -32,7 +32,7 @@ public class RockSaltLamp extends Block implements NamedMineralogyBlock { private static final VoxelShape EAST_SHAPE = Block.box(0.0D, 3.2D, 5.6D, 4.8D, 12.8D, 10.4D); public RockSaltLamp() { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.STONE).strength(0.25F) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.STONE).strength(0.25F) .lightLevel(state -> 15).sound(SoundType.STONE)); this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.UP)); } @@ -131,7 +131,7 @@ public BlockState rotate(BlockState state, Rotation rotation) { @Override public BlockState mirror(BlockState state, Mirror mirror) { - return state.rotate(mirror.getRotation(state.getValue(FACING))); + return rotate(state, mirror.getRotation(state.getValue(FACING))); } @Override diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltStreetLamp.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltStreetLamp.java index 98ef1abd7..8586006be 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltStreetLamp.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltStreetLamp.java @@ -27,7 +27,7 @@ public class RockSaltStreetLamp extends Block implements NamedMineralogyBlock { private static final VoxelShape STANDING_SHAPE = Block.box(6.4D, 0.0D, 6.4D, 9.6D, 28.8D, 9.6D); public RockSaltStreetLamp() { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.IRON_BLOCK).strength(1.0F) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.IRON_BLOCK).strength(1.0F) .lightLevel(state -> 15).sound(SoundType.METAL)); this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.UP)); } @@ -81,7 +81,7 @@ public BlockState rotate(BlockState state, Rotation rotation) { @Override public BlockState mirror(BlockState state, Mirror mirror) { - return state.rotate(mirror.getRotation(state.getValue(FACING))); + return rotate(state, mirror.getRotation(state.getValue(FACING))); } @Override diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java index 695c158e7..33e19b91e 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java @@ -10,7 +10,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; import net.minecraft.resources.ResourceLocation; @@ -52,7 +52,7 @@ public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, So public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name, String doubleSlabName) { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance).sound(sound) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance).sound(sound) .requiresCorrectToolForDrops()); this.toolHardnessLevel = toolHardnessLevel; this.doubleSlabName = doubleSlabName; @@ -96,31 +96,33 @@ public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { } @Override - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, - InteractionHand hand, BlockHitResult hit) { + protected ItemInteractionResult useItemOn(ItemStack held, BlockState state, Level world, BlockPos pos, + Player player, InteractionHand hand, BlockHitResult hit) { Direction facing = hit.getDirection(); if (this.doubleSlabName == null || this.doubleSlabName.isEmpty() || facing != state.getValue(FACING)) { - return super.use(state, world, pos, player, hand, hit); + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } - ItemStack held = player.getItemInHand(hand); ResourceLocation slabItemName = held.isEmpty() ? null : ForgeRegistries.ITEMS.getKey(held.getItem()); if (!ForgeRegistries.BLOCKS.getKey(this).equals(slabItemName)) { - return super.use(state, world, pos, player, hand, hit); + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } - Block doubleSlab = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, this.doubleSlabName)); + Block doubleSlab = ForgeRegistries.BLOCKS.getValue( + ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, this.doubleSlabName)); if (!(doubleSlab instanceof DoubleSlab)) { - return super.use(state, world, pos, player, hand, hit); + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } - world.setBlock(pos, doubleSlab.defaultBlockState(), 3); - if (!player.isCreative()) { - held.shrink(1); + if (!world.isClientSide) { + world.setBlock(pos, doubleSlab.defaultBlockState(), 3); + if (!player.isCreative()) { + held.shrink(1); + } } - return InteractionResult.SUCCESS; + return ItemInteractionResult.sidedSuccess(world.isClientSide); } @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java index ec4e8a119..c82fd1349 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java @@ -11,7 +11,7 @@ public class RockStairs extends StairBlock implements NamedMineralogyBlock { public RockStairs(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name) { - super(materialBlock.defaultBlockState(), BlockBehaviour.Properties.copy(materialBlock) + super(materialBlock.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(materialBlock) .strength(hardness, blastResistance).sound(sound).requiresCorrectToolForDrops()); this.registryPath = name; diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java index 6d08513af..88ea3b681 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java @@ -15,7 +15,7 @@ public class RockWall extends WallBlock implements NamedMineralogyBlock { private final String registryPath; public RockWall(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name) { - super(BlockBehaviour.Properties.copy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance).sound(sound) + super(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.STONE).strength(hardness, blastResistance).sound(sound) .requiresCorrectToolForDrops()); this.registryPath = name; diff --git a/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java b/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java index 195c03e8f..53b422602 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java @@ -1,19 +1,14 @@ package zone.moddev.mc.mineralogy.client; import zone.moddev.mc.mineralogy.Mineralogy; -import zone.moddev.mc.mineralogy.blocks.DryWall; -import zone.moddev.mc.mineralogy.blocks.RockSaltLamp; -import zone.moddev.mc.mineralogy.blocks.RockSaltStreetLamp; import zone.moddev.mc.mineralogy.init.MineralogyFluids; -import net.minecraft.world.level.block.Block; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.registries.ForgeRegistries; @Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public final class ClientSetup { @@ -22,12 +17,8 @@ private ClientSetup() { @SubscribeEvent public static void clientSetup(FMLClientSetupEvent event) { - RenderType cutout = RenderType.cutout(); - for (Block block : ForgeRegistries.BLOCKS.getValues()) { - if (block instanceof DryWall || block instanceof RockSaltLamp || block instanceof RockSaltStreetLamp) { - ItemBlockRenderTypes.setRenderLayer(block, cutout); - } - } + // Block render types are declared by their model JSON on Forge 50. + // Fluid render layers still use the target-native client registration API. ItemBlockRenderTypes.setRenderLayer(MineralogyFluids.CRUDE_OIL.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(MineralogyFluids.FLOWING_CRUDE_OIL.get(), RenderType.translucent()); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java index 5d974ced6..f04b227ec 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java +++ b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java @@ -25,13 +25,13 @@ import zone.moddev.mc.mineralogy.data.Material; import zone.moddev.mc.mineralogy.data.MaterialData; -/** Applies the legacy cobblestone option to Forge 47 block and item tags. */ +/** Applies the legacy cobblestone option to Forge 50 block and item tags. */ public final class CobblestoneTagPolicy { - private static final ResourceLocation COBBLESTONE = new ResourceLocation("forge", "cobblestone"); + private static final ResourceLocation COBBLESTONE = ResourceLocation.fromNamespaceAndPath("forge", "cobblestone"); private static final ResourceLocation STONE_CRAFTING_MATERIALS = - new ResourceLocation("minecraft", "stone_crafting_materials"); + ResourceLocation.fromNamespaceAndPath("minecraft", "stone_crafting_materials"); private static final ResourceLocation STONE_TOOL_MATERIALS = - new ResourceLocation("minecraft", "stone_tool_materials"); + ResourceLocation.fromNamespaceAndPath("minecraft", "stone_tool_materials"); private CobblestoneTagPolicy() { } @@ -65,7 +65,7 @@ static void apply(RegistryAccess access) { itemRegistry.bindTags(itemTags); Ingredient.invalidateAll(); - Mineralogy.LOGGER.debug("Applied Forge 47 cobblestone policy: enabled={}, rocks={}, " + Mineralogy.LOGGER.debug("Applied Forge 50 cobblestone policy: enabled={}, rocks={}, " + "forgeItems={}, craftingItems={}, toolItems={}", enabled, configuredItems.size(), size(itemRegistry, Registries.ITEM, COBBLESTONE), size(itemRegistry, Registries.ITEM, STONE_CRAFTING_MATERIALS), @@ -89,7 +89,7 @@ private static Set> rawRockHolders(Registry registry, Set> values = new LinkedHashSet<>(); for (Material material : MaterialData.allIncludingRockSalt()) { TagKey tag = TagKey.create(registryKey, - new ResourceLocation(Mineralogy.MODID, "stones/" + material.id())); + ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "stones/" + material.id())); registry.getTag(tag).ifPresent(named -> named.forEach(values::add)); } return values; @@ -106,7 +106,7 @@ static void updateTag(Map, List>> tags, Registry regi } for (String name : unconditionalNames) { ResourceKey valueKey = ResourceKey.create(registryKey, - new ResourceLocation(Mineralogy.MODID, name)); + ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, name)); registry.getHolder(valueKey).ifPresent(values::add); } tags.put(key, new ArrayList<>(values)); diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java index c12393ff6..c25151917 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java @@ -453,7 +453,7 @@ private static T register(IForgeRegistry registry, T bl if (path == null || path.isEmpty()) { throw new IllegalArgumentException("Mineralogy block has an empty registry path: " + block.getClass()); } - registry.register(new ResourceLocation(Mineralogy.MODID, path), block); + registry.register(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, path), block); bindLegacyBlockField(path, block); return block; } diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/Items.java b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java index 3b6008ff2..3af78bec9 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/Items.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java @@ -115,7 +115,7 @@ private static Item createFertilizer() { } private static T register(IForgeRegistry registry, String path, T item) { - registry.register(new ResourceLocation(Mineralogy.MODID, path), item); + registry.register(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, path), item); return item; } diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java index 5267aae12..7b8958e3a 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java @@ -35,9 +35,9 @@ public final class MineralogyFluids { private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Mineralogy.MODID); - private static final ResourceLocation CRUDE_OIL_STILL = new ResourceLocation(Mineralogy.MODID, + private static final ResourceLocation CRUDE_OIL_STILL = ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "blocks/crude_oil_still"); - private static final ResourceLocation CRUDE_OIL_FLOW = new ResourceLocation(Mineralogy.MODID, + private static final ResourceLocation CRUDE_OIL_FLOW = ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "blocks/crude_oil_flow"); public static final RegistryObject CRUDE_OIL_TYPE = FLUID_TYPES.register("crude_oil", diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java index 891ed7ae8..357f23821 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java @@ -111,12 +111,12 @@ private static CreativeModeTab register(RegisterEvent.RegisterHelper icon(iconItemName)) .withSearchBar() .build(); - helper.register(new ResourceLocation(Mineralogy.MODID, name), tab); + helper.register(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, name), tab); return tab; } private static ItemStack icon(String itemName) { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, itemName)); + Item item = ForgeRegistries.ITEMS.getValue(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, itemName)); return new ItemStack(item == null ? net.minecraft.world.item.Items.IRON_PICKAXE : item); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/TileEntities.java b/src/main/java/zone/moddev/mc/mineralogy/init/TileEntities.java index e80435980..f3b9308ca 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/TileEntities.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/TileEntities.java @@ -36,7 +36,7 @@ public static void registerTileEntities(RegisterEvent event) { rock_furnace = BlockEntityType.Builder .of(TileEntityRockFurnace::new, furnaceBlocks.toArray(new Block[furnaceBlocks.size()])) .build(null); - registry.register(new ResourceLocation(Mineralogy.MODID, "rock_furnace"), rock_furnace); + registry.register(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "rock_furnace"), rock_furnace); } private TileEntities() { diff --git a/src/main/java/zone/moddev/mc/mineralogy/inventory/SlotRockFurnaceOutput.java b/src/main/java/zone/moddev/mc/mineralogy/inventory/SlotRockFurnaceOutput.java index c453c8e13..d286f0a31 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/inventory/SlotRockFurnaceOutput.java +++ b/src/main/java/zone/moddev/mc/mineralogy/inventory/SlotRockFurnaceOutput.java @@ -11,6 +11,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.SmeltingRecipe; import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; @@ -69,8 +70,9 @@ protected void checkTakeAchievements(ItemStack stack) { private void spawnExperience() { for (Map.Entry entry : furnace.getRecipeUseCounts().entrySet()) { - Recipe recipe = player.level().getRecipeManager().byKey(entry.getKey()).orElse(null); - float experience = recipe instanceof SmeltingRecipe ? ((SmeltingRecipe) recipe).getExperience() : 0.0F; + RecipeHolder recipe = player.level().getRecipeManager().byKey(entry.getKey()).orElse(null); + float experience = recipe != null && recipe.value() instanceof SmeltingRecipe + ? ((SmeltingRecipe) recipe.value()).getExperience() : 0.0F; int amount = getExperienceAmount(entry.getValue().intValue(), experience); if (amount > 0 && player.level() instanceof ServerLevel) { diff --git a/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java index f27a15853..3b8dbff38 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java +++ b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java @@ -146,7 +146,7 @@ private static JsonObject loadPackagedProvider() throws IOException { InputStream stream = LegacyOreConfigMigrator.class.getClassLoader().getResourceAsStream(PROVIDER_RESOURCE); if (stream == null) throw new IOException("missing " + PROVIDER_RESOURCE); try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) { - JsonElement parsed = new JsonParser().parse(reader); + JsonElement parsed = JsonParser.parseReader(reader); if (!parsed.isJsonObject()) throw new IOException("provider root is not an object"); return parsed.getAsJsonObject(); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java index aeb28e07a..8fd8fb9fd 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java @@ -32,6 +32,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtIo; +import net.minecraft.nbt.NbtAccounter; import net.minecraft.nbt.NbtUtils; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.datafix.fixes.BlockStateData; @@ -61,24 +62,38 @@ public final class LegacyWorldDataHook { private static volatile boolean legacyWorldActive; static { - BLOCK_ALIASES.put(new ResourceLocation(Mineralogy.MODID, "pummice"), - new ResourceLocation(Mineralogy.MODID, "pumice")); - BLOCK_ALIASES.put(new ResourceLocation(Mineralogy.MODID, "saprolite"), - new ResourceLocation(Mineralogy.MODID, "limestone")); + BLOCK_ALIASES.put(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "pummice"), + ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "pumice")); + BLOCK_ALIASES.put(ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "saprolite"), + ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, "limestone")); } private LegacyWorldDataHook() { } /** Called from Forge's raw additional-level-data reader before legacy FML data is discarded. */ - public static void captureLegacyLevelData(CompoundTag root, + public static void captureLegacyLevelData(LevelStorageSource.LevelStorageAccess access, LevelStorageSource.LevelDirectory levelDirectory) { - if (root == null || levelDirectory == null) { + if (access == null || levelDirectory == null) { return; } + CompoundTag root; + try { + root = access.getDataTagRaw(false); + } catch (IOException primaryFailure) { + try { + root = access.getDataTagRaw(true); + } catch (IOException fallbackFailure) { + LOGGER.warn("Could not inspect primary or fallback level data in '{}' for legacy Mineralogy mappings", + levelDirectory.path(), fallbackFailure); + return; + } + } Path levelPath = levelDirectory.path(); if (root.contains("FML", 10)) { prepareLegacyWorld(levelPath.toFile(), root.getCompound("FML")); + } else if (root.contains("fml", 10)) { + prepareLegacyWorld(levelPath.toFile(), root.getCompound("fml")); } else { prepareLegacyWorld(levelPath.resolve("level.dat").toFile()); } @@ -99,7 +114,7 @@ private static synchronized void prepareLegacyWorld(File levelDat) { } try (FileInputStream input = new FileInputStream(levelDat)) { - CompoundTag root = NbtIo.readCompressed(input); + CompoundTag root = NbtIo.readCompressed(input, NbtAccounter.unlimitedHeap()); if (root.contains("FML", 10)) { CompoundTag fml = root.getCompound("FML"); CompoundTag registries = fml.getCompound("Registries"); @@ -118,7 +133,7 @@ private static synchronized void prepareLegacyWorld(File levelDat) { File sidecar = sidecar(levelDat.getParentFile()); if (sidecar.isFile()) { try (FileInputStream input = new FileInputStream(sidecar)) { - install(levelDat.getParentFile(), NbtIo.readCompressed(input).getCompound("Blocks")); + install(levelDat.getParentFile(), NbtIo.readCompressed(input, NbtAccounter.unlimitedHeap()).getCompound("Blocks")); } catch (IOException e) { LOGGER.warn("Could not read legacy Mineralogy registry sidecar '{}'", sidecar, e); } @@ -141,7 +156,7 @@ private static synchronized void prepareLegacyWorld(File worldDirectory, Compoun File sidecar = sidecar(worldDirectory); if (sidecar.isFile()) { try (FileInputStream input = new FileInputStream(sidecar)) { - install(worldDirectory, NbtIo.readCompressed(input).getCompound("Blocks")); + install(worldDirectory, NbtIo.readCompressed(input, NbtAccounter.unlimitedHeap()).getCompound("Blocks")); } catch (IOException e) { LOGGER.warn("Could not read legacy Mineralogy registry sidecar '{}'", sidecar, e); } @@ -279,7 +294,7 @@ private static int installLegacyBlockStates(CompoundTag blockSnapshot) { if (!key.startsWith(Mineralogy.MODID + ":")) { continue; } - ResourceLocation id = new ResourceLocation(key); + ResourceLocation id = ResourceLocation.parse(key); int numericId = savedId.getInt("V"); mineralogyIds.put(id, numericId); highestStateId = Math.max(highestStateId, (numericId << 4) | 15); @@ -307,7 +322,7 @@ private static int installLegacyBlockStates(CompoundTag blockSnapshot) { } /** - * Minecraft 1.20.1 still fixes the pre-flattening state table at 4,096 entries, + * Minecraft 1.20.6 still fixes the pre-flattening state table at 4,096 entries, * while Forge 1.12 worlds commonly assign mod blocks higher numeric IDs. * Replace that exact static-final array before writing any recovered states. */ diff --git a/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java b/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java index 562a46386..05a4216d4 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java @@ -73,10 +73,10 @@ private static void remapMissing(List> mappi } private static ResourceLocation mineralogyId(String path) { - return new ResourceLocation(Mineralogy.MODID, path); + return ResourceLocation.fromNamespaceAndPath(Mineralogy.MODID, path); } private static ResourceLocation minecraftId(String path) { - return new ResourceLocation("minecraft", path); + return ResourceLocation.fromNamespaceAndPath("minecraft", path); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java b/src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java index 415a7c881..9bca6b3b2 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java +++ b/src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java @@ -13,6 +13,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -28,12 +29,13 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.ContainerData; import net.minecraft.world.inventory.FurnaceFuelSlot; -import net.minecraft.world.inventory.RecipeHolder; +import net.minecraft.world.inventory.RecipeCraftingHolder; import net.minecraft.world.inventory.StackedContentsCompatible; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.item.crafting.SmeltingRecipe; import net.minecraft.world.level.GameRules; @@ -50,7 +52,7 @@ import net.minecraftforge.items.wrapper.SidedInvWrapper; public class TileEntityRockFurnace extends BaseContainerBlockEntity - implements WorldlyContainer, RecipeHolder, StackedContentsCompatible { + implements WorldlyContainer, RecipeCraftingHolder, StackedContentsCompatible { private static final int[] SLOTS_TOP = new int[] { 0 }; private static final int[] SLOTS_BOTTOM = new int[] { 2, 1 }; private static final int[] SLOTS_SIDES = new int[] { 1 }; @@ -79,6 +81,7 @@ public int getCount() { }; private LazyOptional[] handlers = createHandlers(); private final float fallbackBurnModifier; + private Component customInventoryName; public TileEntityRockFurnace(BlockPos pos, BlockState state) { this(pos, state, 1.0F); @@ -122,7 +125,7 @@ public ItemStack removeItemNoUpdate(int index) { @Override public void setItem(int index, ItemStack stack) { ItemStack previous = furnaceItemStacks.get(index); - boolean sameStack = !stack.isEmpty() && ItemStack.isSameItemSameTags(stack, previous); + boolean sameStack = !stack.isEmpty() && ItemStack.isSameItemSameComponents(stack, previous); furnaceItemStacks.set(index, stack); if (stack.getCount() > getMaxStackSize()) { @@ -142,14 +145,31 @@ protected Component getDefaultName() { } public void setCustomInventoryName(Component name) { - setCustomName(name); + customInventoryName = name; + setChanged(); } @Override - public void load(CompoundTag compound) { - super.load(compound); + public Component getCustomName() { + return customInventoryName == null ? super.getCustomName() : customInventoryName; + } + + @Override + protected NonNullList getItems() { + return furnaceItemStacks; + } + + @Override + protected void setItems(NonNullList items) { + furnaceItemStacks = items; + } + + @Override + protected void loadAdditional(CompoundTag compound, HolderLookup.Provider registries) { + super.loadAdditional(compound, registries); + customInventoryName = null; furnaceItemStacks = NonNullList.withSize(getContainerSize(), ItemStack.EMPTY); - ContainerHelper.loadAllItems(compound, furnaceItemStacks); + ContainerHelper.loadAllItems(compound, furnaceItemStacks, registries); furnaceBurnTime = compound.getInt("BurnTime"); cookTime = compound.getInt("CookTime"); totalCookTime = compound.getInt("CookTimeTotal"); @@ -157,12 +177,15 @@ public void load(CompoundTag compound) { } @Override - protected void saveAdditional(CompoundTag compound) { - super.saveAdditional(compound); + protected void saveAdditional(CompoundTag compound, HolderLookup.Provider registries) { + super.saveAdditional(compound, registries); compound.putInt("BurnTime", furnaceBurnTime); compound.putInt("CookTime", cookTime); compound.putInt("CookTimeTotal", totalCookTime); - ContainerHelper.saveAllItems(compound, furnaceItemStacks); + ContainerHelper.saveAllItems(compound, furnaceItemStacks, registries); + if (customInventoryName != null) { + compound.putString("CustomName", Component.Serializer.toJson(customInventoryName, registries)); + } } public boolean isBurning() { @@ -183,7 +206,7 @@ private void tickServer(Level level, BlockPos pos) { ItemStack fuel = furnaceItemStacks.get(1); if (isBurning() || !fuel.isEmpty() && !furnaceItemStacks.get(0).isEmpty()) { - SmeltingRecipe recipe = getSmeltingRecipe(); + RecipeHolder recipe = getSmeltingRecipe(); if (!isBurning() && canSmelt(recipe)) { furnaceBurnTime = (int) (getItemBurnTime(fuel) * getBurnModifier()); @@ -228,17 +251,17 @@ private void tickServer(Level level, BlockPos pos) { } } - private int getCookTime(@Nullable SmeltingRecipe recipe) { - return recipe != null ? recipe.getCookingTime() : 200; + private int getCookTime(@Nullable RecipeHolder recipe) { + return recipe != null ? recipe.value().getCookingTime() : 200; } @Nullable - private SmeltingRecipe getSmeltingRecipe() { + private RecipeHolder getSmeltingRecipe() { return level == null ? null : level.getRecipeManager().getRecipeFor(RecipeType.SMELTING, this, level).orElse(null); } - private boolean canSmelt(@Nullable Recipe recipe) { + private boolean canSmelt(@Nullable RecipeHolder> recipe) { if (furnaceItemStacks.get(0).isEmpty() || recipe == null) { return false; } @@ -246,7 +269,7 @@ private boolean canSmelt(@Nullable Recipe recipe) { if (level == null) { return false; } - ItemStack result = recipe.getResultItem(level.registryAccess()); + ItemStack result = recipe.value().getResultItem(level.registryAccess()); if (result.isEmpty()) { return false; } @@ -266,13 +289,13 @@ private boolean canSmelt(@Nullable Recipe recipe) { return output.getCount() + result.getCount() <= result.getMaxStackSize(); } - private void smeltItem(@Nullable Recipe recipe) { + private void smeltItem(@Nullable RecipeHolder> recipe) { if (!canSmelt(recipe)) { return; } ItemStack input = furnaceItemStacks.get(0); - ItemStack result = recipe.getResultItem(level.registryAccess()); + ItemStack result = recipe.value().getResultItem(level.registryAccess()); ItemStack output = furnaceItemStacks.get(2); if (output.isEmpty()) { @@ -395,17 +418,17 @@ public void fillStackedContents(StackedContents helper) { } @Override - public void setRecipeUsed(Recipe recipe) { + public void setRecipeUsed(RecipeHolder recipe) { if (recipe == null) { return; } - ResourceLocation id = recipe.getId(); + ResourceLocation id = recipe.id(); Integer count = recipeUseCounts.get(id); recipeUseCounts.put(id, count == null ? 1 : count + 1); } @Override - public Recipe getRecipeUsed() { + public RecipeHolder getRecipeUsed() { return null; } @@ -414,16 +437,16 @@ public Map getRecipeUseCounts() { } @Override - public boolean setRecipeUsed(Level level, ServerPlayer player, Recipe recipe) { + public boolean setRecipeUsed(Level level, ServerPlayer player, RecipeHolder recipe) { setRecipeUsed(recipe); return recipe != null; } public void onCrafting(Player player) { if (!player.level().getGameRules().getBoolean(GameRules.RULE_LIMITED_CRAFTING)) { - List> recipes = new ArrayList>(); + List> recipes = new ArrayList>(); for (ResourceLocation id : recipeUseCounts.keySet()) { - Recipe recipe = player.level().getRecipeManager().byKey(id).orElse(null); + RecipeHolder recipe = player.level().getRecipeManager().byKey(id).orElse(null); if (recipe != null) { recipes.add(recipe); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 251fda487..fd586cd9e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[47,)" +loaderVersion="[50,)" license="LGPL-2.1" issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/issues" displayURL="https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy" @@ -18,7 +18,7 @@ Fills the world with real-world rocks. [[dependencies.mineralogy]] modId="forge" mandatory=true - versionRange="[47.4.10,48)" + versionRange="[50.2.0,51)" ordering="NONE" side="BOTH" @@ -32,6 +32,6 @@ Fills the world with real-world rocks. [[dependencies.mineralogy]] modId="minecraft" mandatory=true - versionRange="[1.20.1]" + versionRange="[1.20.6]" ordering="NONE" side="BOTH" diff --git a/src/main/resources/assets/mineralogy/models/block/pane_n.json b/src/main/resources/assets/mineralogy/models/block/pane_n.json index fd31d0a39..641e576bb 100644 --- a/src/main/resources/assets/mineralogy/models/block/pane_n.json +++ b/src/main/resources/assets/mineralogy/models/block/pane_n.json @@ -1,4 +1,5 @@ -{ +{ + "render_type": "cutout", "ambientocclusion": false, "textures": { "particle": "#pane" diff --git a/src/main/resources/assets/mineralogy/models/block/pane_ne.json b/src/main/resources/assets/mineralogy/models/block/pane_ne.json index 2af92a6c6..2b661c961 100644 --- a/src/main/resources/assets/mineralogy/models/block/pane_ne.json +++ b/src/main/resources/assets/mineralogy/models/block/pane_ne.json @@ -1,4 +1,5 @@ -{ +{ + "render_type": "cutout", "ambientocclusion": false, "textures": { "particle": "#pane" diff --git a/src/main/resources/assets/mineralogy/models/block/pane_ns.json b/src/main/resources/assets/mineralogy/models/block/pane_ns.json index 5e421f780..e0f844e9d 100644 --- a/src/main/resources/assets/mineralogy/models/block/pane_ns.json +++ b/src/main/resources/assets/mineralogy/models/block/pane_ns.json @@ -1,4 +1,5 @@ -{ +{ + "render_type": "cutout", "ambientocclusion": false, "textures": { "particle": "#pane" diff --git a/src/main/resources/assets/mineralogy/models/block/pane_nse.json b/src/main/resources/assets/mineralogy/models/block/pane_nse.json index 6523617f4..b45466820 100644 --- a/src/main/resources/assets/mineralogy/models/block/pane_nse.json +++ b/src/main/resources/assets/mineralogy/models/block/pane_nse.json @@ -1,4 +1,5 @@ -{ +{ + "render_type": "cutout", "ambientocclusion": false, "textures": { "particle": "#pane" diff --git a/src/main/resources/assets/mineralogy/models/block/pane_nsew.json b/src/main/resources/assets/mineralogy/models/block/pane_nsew.json index 3120dacc9..fb052c189 100644 --- a/src/main/resources/assets/mineralogy/models/block/pane_nsew.json +++ b/src/main/resources/assets/mineralogy/models/block/pane_nsew.json @@ -1,4 +1,5 @@ -{ +{ + "render_type": "cutout", "ambientocclusion": false, "textures": { "particle": "#pane" diff --git a/src/main/resources/assets/mineralogy/models/block/rocksaltlamp.json b/src/main/resources/assets/mineralogy/models/block/rocksaltlamp.json index c2f4bde87..8bee226e8 100644 --- a/src/main/resources/assets/mineralogy/models/block/rocksaltlamp.json +++ b/src/main/resources/assets/mineralogy/models/block/rocksaltlamp.json @@ -1,4 +1,5 @@ { + "render_type": "cutout", "credit": "Made with Blockbench", "textures": { "0": "mineralogy:blocks/rocksalt_lamp", @@ -56,4 +57,4 @@ "children": [1, 2] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_down.json b/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_down.json index fb8475732..142228e1f 100644 --- a/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_down.json +++ b/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_down.json @@ -1,4 +1,5 @@ { + "render_type": "cutout", "credit": "Made with Blockbench", "textures": { "0": "mineralogy:blocks/rocksalt_lamp", @@ -157,4 +158,4 @@ "children": [3, 4, 5, 6, 7, 8, 9, 10] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_wall.json b/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_wall.json index 73ac74beb..5cefe28c3 100644 --- a/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_wall.json +++ b/src/main/resources/assets/mineralogy/models/block/rocksaltlamp_wall.json @@ -1,4 +1,5 @@ { + "render_type": "cutout", "credit": "Made with Blockbench", "textures": { "0": "mineralogy:blocks/rocksalt_lamp", @@ -181,4 +182,4 @@ "children": [11, 12] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/mineralogy/models/block/rocksaltstreetlamp.json b/src/main/resources/assets/mineralogy/models/block/rocksaltstreetlamp.json index f90599b3c..dfaea92b3 100644 --- a/src/main/resources/assets/mineralogy/models/block/rocksaltstreetlamp.json +++ b/src/main/resources/assets/mineralogy/models/block/rocksaltstreetlamp.json @@ -1,4 +1,5 @@ { + "render_type": "cutout", "credit": "Made with Blockbench", "textures": { "0": "mineralogy:blocks/wroughtiron_lamp", @@ -110,4 +111,4 @@ "children": [5, 6] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/coremods/mineralogy_legacy_world_fix.js b/src/main/resources/coremods/mineralogy_legacy_world_fix.js index 9c60dc512..8e0c73189 100644 --- a/src/main/resources/coremods/mineralogy_legacy_world_fix.js +++ b/src/main/resources/coremods/mineralogy_legacy_world_fix.js @@ -61,7 +61,7 @@ function initializeCoreMod() { 'transformer': function(classNode) { for (var methodIndex = 0; methodIndex < classNode.methods.size(); ++methodIndex) { var method = classNode.methods.get(methodIndex); - if (method.desc !== '(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/storage/LevelStorageSource$LevelDirectory;)V') { + if (method.desc !== '(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lnet/minecraft/world/level/storage/LevelStorageSource$LevelDirectory;)V') { continue; } var prefix = new InsnList(); @@ -71,7 +71,7 @@ function initializeCoreMod() { Opcodes.INVOKESTATIC, 'zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook', 'captureLegacyLevelData', - '(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/storage/LevelStorageSource$LevelDirectory;)V', + '(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lnet/minecraft/world/level/storage/LevelStorageSource$LevelDirectory;)V', false)); method.instructions.insert(prefix); } diff --git a/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json b/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json index 895af832d..dc3f39946 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json +++ b/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:brewing_stand" - ] - }, - "criteria": { - "has_blaze_rod": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:blaze_rod" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:brewing_stand" - } - } - }, - "requirements": [ - [ - "has_blaze_rod", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:brewing_stand" + ] + }, + "criteria": { + "has_blaze_rod": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:blaze_rod" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:brewing_stand" + } + } + }, + "requirements": [ + [ + "has_blaze_rod", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:brewing_stand" - ] - }, - "criteria": { - "has_blaze_rod": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:blaze_rod" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:brewing_stand" - } - } - }, - "requirements": [ - [ - "has_blaze_rod", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:brewing_stand" + ] + }, + "criteria": { + "has_blaze_rod": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:blaze_rod" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:brewing_stand" + } + } + }, + "requirements": [ + [ + "has_blaze_rod", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json index 877434f1c..50ec723b9 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:andesite" - ] - }, - "criteria": { - "has_stone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:diorite" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:andesite" - } - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:andesite" + ] + }, + "criteria": { + "has_stone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:diorite" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:andesite" + } + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:andesite" - ] - }, - "criteria": { - "has_stone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:diorite" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:andesite" - } - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:andesite" + ] + }, + "criteria": { + "has_stone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:diorite" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:andesite" + } + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json index 1262292e4..06f754d31 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:diorite" - ] + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:quartz" + } + ] + } }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:quartz" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:diorite" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:diorite" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:diorite" - ] + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:quartz" + } + ] + } }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:quartz" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:diorite" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:diorite" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json index 7f94783ed..5e662830c 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:mossy_cobblestone_from_moss_block" - ] - }, - "criteria": { - "has_moss_block": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:moss_block" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:mossy_cobblestone_from_moss_block" - } - } - }, - "requirements": [ - [ - "has_moss_block", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_moss_block" + ] + }, + "criteria": { + "has_moss_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:moss_block" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_moss_block" + } + } + }, + "requirements": [ + [ + "has_moss_block", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:mossy_cobblestone_from_moss_block" - ] - }, - "criteria": { - "has_moss_block": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:moss_block" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:mossy_cobblestone_from_moss_block" - } - } - }, - "requirements": [ - [ - "has_moss_block", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_moss_block" + ] + }, + "criteria": { + "has_moss_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:moss_block" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_moss_block" + } + } + }, + "requirements": [ + [ + "has_moss_block", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json index 7c4b0855f..1941ccdc3 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:mossy_cobblestone_from_vine" - ] - }, - "criteria": { - "has_vine": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:vine" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:mossy_cobblestone_from_vine" - } - } - }, - "requirements": [ - [ - "has_vine", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_vine" + ] + }, + "criteria": { + "has_vine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:vine" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_vine" + } + } + }, + "requirements": [ + [ + "has_vine", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:mossy_cobblestone_from_vine" - ] - }, - "criteria": { - "has_vine": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:vine" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:mossy_cobblestone_from_vine" - } - } - }, - "requirements": [ - [ - "has_vine", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_vine" + ] + }, + "criteria": { + "has_vine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:vine" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_vine" + } + } + }, + "requirements": [ + [ + "has_vine", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json index 00e153f51..545f0dbd8 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:andesite" - ] + "items": "minecraft:andesite" } ] } @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:sand" - ] + "items": "minecraft:sand" } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json index 4c70f079a..79ee3f1c9 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:basalt" - ] + "items": "minecraft:basalt" } ] } @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:sand" - ] + "items": "minecraft:sand" } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json index 0d337d107..1da463c15 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:diorite" - ] + "items": "minecraft:diorite" } ] } @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:sand" - ] + "items": "minecraft:sand" } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json index c0898b241..d76a05e94 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:granite" - ] + "items": "minecraft:granite" } ] } @@ -23,9 +21,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:sand" - ] + "items": "minecraft:sand" } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json b/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json index b81d44b1a..b60f8dcb5 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json +++ b/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json @@ -1,89 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_sword" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_sword" - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_sword" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#mineralogy:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_sword" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_sword" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_sword" - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_sword" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_sword" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json index 7038d39cd..094276e4f 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json +++ b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json @@ -1,89 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:furnace" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_crafting_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:furnace" - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:furnace" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#mineralogy:stone_crafting_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:furnace" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:furnace" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_crafting_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:furnace" - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:furnace" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:stone_crafting_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:furnace" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json index c425c5e72..f65f72233 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dispenser" - ] - }, - "criteria": { - "has_bow": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:bow" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dispenser" - } - } - }, - "requirements": [ - [ - "has_bow", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dispenser" + ] + }, + "criteria": { + "has_bow": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:bow" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dispenser" + } + } + }, + "requirements": [ + [ + "has_bow", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dispenser" - ] - }, - "criteria": { - "has_bow": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:bow" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dispenser" - } - } - }, - "requirements": [ - [ - "has_bow", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dispenser" + ] + }, + "criteria": { + "has_bow": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:bow" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dispenser" + } + } + }, + "requirements": [ + [ + "has_bow", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json index baca01938..4ad9f6d0f 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dropper" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:redstone" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dropper" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dropper" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dropper" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dropper" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:redstone" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dropper" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dropper" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dropper" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json index 8a41609d9..77a4e053c 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json @@ -1,89 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:lever" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:cobblestone_equivalents" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:lever" - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lever" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#mineralogy:cobblestone_equivalents" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:lever" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:lever" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "forge:cobblestone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:lever" - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lever" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#forge:cobblestone" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:lever" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json index 76b0f1fdd..2b5da0a14 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:observer" - ] + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:quartz" + } + ] + } }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:quartz" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:observer" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:observer" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:observer" - ] + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:quartz" + } + ] + } }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:quartz" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:observer" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:observer" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json index 9f3049402..3ec3bb4c7 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json @@ -1,93 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:piston" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:redstone" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:piston" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:piston" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:piston" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:piston" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:redstone" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:piston" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:piston" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:piston" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json index 12e577501..a3bfb4429 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json @@ -1,89 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_axe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_axe" - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_axe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#mineralogy:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_axe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_axe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_axe" - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_axe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_axe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json index a63a7803e..a1931cb01 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json @@ -1,89 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_hoe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_hoe" - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_hoe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#mineralogy:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_hoe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_hoe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_hoe" - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_hoe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_hoe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json index d25d5d7a3..a1dd88685 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json @@ -1,89 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_pickaxe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_pickaxe" - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_pickaxe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#mineralogy:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_pickaxe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_pickaxe" - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_pickaxe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json index ff5fb3a49..f99168e97 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json @@ -1,89 +1,81 @@ { "advancements": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_shovel" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_shovel" - } + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_shovel" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#mineralogy:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_shovel" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_shovel" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_shovel" - } + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_shovel" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:stone_tool_materials" + } + ] } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ], - "sends_telemetry_event": false - } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_shovel" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ], + "sends_telemetry_event": false } ] } diff --git a/src/main/resources/data/minecraft/recipes/andesite.json b/src/main/resources/data/minecraft/recipes/andesite.json index 27e9cb93e..31b2ee0ec 100644 --- a/src/main/resources/data/minecraft/recipes/andesite.json +++ b/src/main/resources/data/minecraft/recipes/andesite.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shapeless", "category": "building", @@ -20,21 +18,19 @@ } ], "result": { - "item": "minecraft:andesite", + "id": "minecraft:andesite", "count": 2 } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shapeless", "category": "building", @@ -47,7 +43,7 @@ } ], "result": { - "item": "minecraft:andesite", + "id": "minecraft:andesite", "count": 2 } } diff --git a/src/main/resources/data/minecraft/recipes/andesite_slab.json b/src/main/resources/data/minecraft/recipes/andesite_slab.json index 6c60ed4e7..ed78ef578 100644 --- a/src/main/resources/data/minecraft/recipes/andesite_slab.json +++ b/src/main/resources/data/minecraft/recipes/andesite_slab.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -20,22 +18,20 @@ } }, "result": { - "item": "mineralogy:andesite_slab", + "id": "mineralogy:andesite_slab", "count": 6 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -48,7 +44,7 @@ } }, "result": { - "item": "minecraft:andesite_slab", + "id": "minecraft:andesite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json index 31a74d211..12d68e74a 100644 --- a/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:andesite" }, - "result": "mineralogy:andesite_slab", - "count": 2 + "result": { + "id": "mineralogy:andesite_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:andesite" }, - "result": "minecraft:andesite_slab", - "count": 2 + "result": { + "id": "minecraft:andesite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/brewing_stand.json b/src/main/resources/data/minecraft/recipes/brewing_stand.json index 1619b2e7a..68e95b2f3 100644 --- a/src/main/resources/data/minecraft/recipes/brewing_stand.json +++ b/src/main/resources/data/minecraft/recipes/brewing_stand.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -24,21 +22,19 @@ } }, "result": { - "item": "minecraft:brewing_stand" + "id": "minecraft:brewing_stand" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -55,7 +51,7 @@ } }, "result": { - "item": "minecraft:brewing_stand" + "id": "minecraft:brewing_stand" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/coast_armor_trim_smithing_template.json b/src/main/resources/data/minecraft/recipes/coast_armor_trim_smithing_template.json index ca77c6114..020fb49ff 100644 --- a/src/main/resources/data/minecraft/recipes/coast_armor_trim_smithing_template.json +++ b/src/main/resources/data/minecraft/recipes/coast_armor_trim_smithing_template.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -28,22 +26,20 @@ } }, "result": { - "item": "minecraft:coast_armor_trim_smithing_template", + "id": "minecraft:coast_armor_trim_smithing_template", "count": 2 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -64,7 +60,7 @@ } }, "result": { - "item": "minecraft:coast_armor_trim_smithing_template", + "id": "minecraft:coast_armor_trim_smithing_template", "count": 2 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/diorite.json b/src/main/resources/data/minecraft/recipes/diorite.json index f60e895da..adff7741a 100644 --- a/src/main/resources/data/minecraft/recipes/diorite.json +++ b/src/main/resources/data/minecraft/recipes/diorite.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -24,22 +22,20 @@ } }, "result": { - "item": "minecraft:diorite", + "id": "minecraft:diorite", "count": 2 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -56,7 +52,7 @@ } }, "result": { - "item": "minecraft:diorite", + "id": "minecraft:diorite", "count": 2 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/diorite_slab.json b/src/main/resources/data/minecraft/recipes/diorite_slab.json index f29917be2..5807b83e9 100644 --- a/src/main/resources/data/minecraft/recipes/diorite_slab.json +++ b/src/main/resources/data/minecraft/recipes/diorite_slab.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -20,22 +18,20 @@ } }, "result": { - "item": "mineralogy:diorite_slab", + "id": "mineralogy:diorite_slab", "count": 6 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -48,7 +44,7 @@ } }, "result": { - "item": "minecraft:diorite_slab", + "id": "minecraft:diorite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json index 7718a7213..83883fd42 100644 --- a/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:diorite" }, - "result": "mineralogy:diorite_slab", - "count": 2 + "result": { + "id": "mineralogy:diorite_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:diorite" }, - "result": "minecraft:diorite_slab", - "count": 2 + "result": { + "id": "minecraft:diorite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/dispenser.json b/src/main/resources/data/minecraft/recipes/dispenser.json index 789c2179d..43e9f3d6c 100644 --- a/src/main/resources/data/minecraft/recipes/dispenser.json +++ b/src/main/resources/data/minecraft/recipes/dispenser.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -28,21 +26,19 @@ } }, "result": { - "item": "minecraft:dispenser" + "id": "minecraft:dispenser" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -63,7 +59,7 @@ } }, "result": { - "item": "minecraft:dispenser" + "id": "minecraft:dispenser" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/dropper.json b/src/main/resources/data/minecraft/recipes/dropper.json index 49974a3e6..bc226fd24 100644 --- a/src/main/resources/data/minecraft/recipes/dropper.json +++ b/src/main/resources/data/minecraft/recipes/dropper.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -25,21 +23,19 @@ } }, "result": { - "item": "minecraft:dropper" + "id": "minecraft:dropper" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -57,7 +53,7 @@ } }, "result": { - "item": "minecraft:dropper" + "id": "minecraft:dropper" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/furnace.json b/src/main/resources/data/minecraft/recipes/furnace.json index d5b2cb35d..2f1129317 100644 --- a/src/main/resources/data/minecraft/recipes/furnace.json +++ b/src/main/resources/data/minecraft/recipes/furnace.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -22,21 +20,19 @@ } }, "result": { - "item": "minecraft:furnace" + "id": "minecraft:furnace" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -51,7 +47,7 @@ } }, "result": { - "item": "minecraft:furnace" + "id": "minecraft:furnace" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/granite_slab.json b/src/main/resources/data/minecraft/recipes/granite_slab.json index a8575d962..fa408383c 100644 --- a/src/main/resources/data/minecraft/recipes/granite_slab.json +++ b/src/main/resources/data/minecraft/recipes/granite_slab.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -20,22 +18,20 @@ } }, "result": { - "item": "mineralogy:granite_slab", + "id": "mineralogy:granite_slab", "count": 6 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -48,7 +44,7 @@ } }, "result": { - "item": "minecraft:granite_slab", + "id": "minecraft:granite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json index 318e4db08..a5d47d40c 100644 --- a/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:granite" }, - "result": "mineralogy:granite_slab", - "count": 2 + "result": { + "id": "mineralogy:granite_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:granite" }, - "result": "minecraft:granite_slab", - "count": 2 + "result": { + "id": "minecraft:granite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/lever.json b/src/main/resources/data/minecraft/recipes/lever.json index 37c760e8e..cd707e91d 100644 --- a/src/main/resources/data/minecraft/recipes/lever.json +++ b/src/main/resources/data/minecraft/recipes/lever.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -24,21 +22,19 @@ } }, "result": { - "item": "minecraft:lever" + "id": "minecraft:lever" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -55,7 +51,7 @@ } }, "result": { - "item": "minecraft:lever" + "id": "minecraft:lever" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json index 8a5159ac4..09f609373 100644 --- a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json +++ b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shapeless", "group": "mossy_cobblestone", @@ -21,20 +19,18 @@ } ], "result": { - "item": "minecraft:mossy_cobblestone" + "id": "minecraft:mossy_cobblestone" } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shapeless", "group": "mossy_cobblestone", @@ -48,7 +44,7 @@ } ], "result": { - "item": "minecraft:mossy_cobblestone" + "id": "minecraft:mossy_cobblestone" } } } diff --git a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json index 135950e40..9b1e125ec 100644 --- a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json +++ b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shapeless", "group": "mossy_cobblestone", @@ -21,20 +19,18 @@ } ], "result": { - "item": "minecraft:mossy_cobblestone" + "id": "minecraft:mossy_cobblestone" } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shapeless", "group": "mossy_cobblestone", @@ -48,7 +44,7 @@ } ], "result": { - "item": "minecraft:mossy_cobblestone" + "id": "minecraft:mossy_cobblestone" } } } diff --git a/src/main/resources/data/minecraft/recipes/observer.json b/src/main/resources/data/minecraft/recipes/observer.json index 53f29710e..2fab0bf32 100644 --- a/src/main/resources/data/minecraft/recipes/observer.json +++ b/src/main/resources/data/minecraft/recipes/observer.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -28,21 +26,19 @@ } }, "result": { - "item": "minecraft:observer" + "id": "minecraft:observer" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -63,7 +59,7 @@ } }, "result": { - "item": "minecraft:observer" + "id": "minecraft:observer" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/piston.json b/src/main/resources/data/minecraft/recipes/piston.json index 7f4eea047..1e7c59d3c 100644 --- a/src/main/resources/data/minecraft/recipes/piston.json +++ b/src/main/resources/data/minecraft/recipes/piston.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -31,21 +29,19 @@ } }, "result": { - "item": "minecraft:piston" + "id": "minecraft:piston" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "redstone", @@ -69,7 +65,7 @@ } }, "result": { - "item": "minecraft:piston" + "id": "minecraft:piston" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite.json b/src/main/resources/data/minecraft/recipes/polished_andesite.json index 8f69fad74..36f57b698 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "minecraft:polished_andesite", + "id": "minecraft:polished_andesite", "count": 1 } } diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json index 4b8afafdb..55bf24ed3 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -20,22 +18,20 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_slab", + "id": "mineralogy:andesite_smooth_slab", "count": 6 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -48,7 +44,7 @@ } }, "result": { - "item": "minecraft:polished_andesite_slab", + "id": "minecraft:polished_andesite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json index 154525a4e..18a7c3d6d 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:andesite" }, - "result": "mineralogy:andesite_smooth_slab", - "count": 2 + "result": { + "id": "mineralogy:andesite_smooth_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:andesite" }, - "result": "minecraft:polished_andesite_slab", - "count": 2 + "result": { + "id": "minecraft:polished_andesite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json index 694788bb6..b2b5fce62 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:polished_andesite" }, - "result": "mineralogy:andesite_smooth_slab", - "count": 2 + "result": { + "id": "mineralogy:andesite_smooth_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:polished_andesite" }, - "result": "minecraft:polished_andesite_slab", - "count": 2 + "result": { + "id": "minecraft:polished_andesite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/polished_basalt.json b/src/main/resources/data/minecraft/recipes/polished_basalt.json index d9e2d31c1..daa846ea2 100644 --- a/src/main/resources/data/minecraft/recipes/polished_basalt.json +++ b/src/main/resources/data/minecraft/recipes/polished_basalt.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "minecraft:polished_basalt", + "id": "minecraft:polished_basalt", "count": 1 } } diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite.json b/src/main/resources/data/minecraft/recipes/polished_diorite.json index 024f6d2eb..e59610385 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "minecraft:polished_diorite", + "id": "minecraft:polished_diorite", "count": 1 } } diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json index de05401f8..5fce8ce4a 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -20,22 +18,20 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_slab", + "id": "mineralogy:diorite_smooth_slab", "count": 6 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -48,7 +44,7 @@ } }, "result": { - "item": "minecraft:polished_diorite_slab", + "id": "minecraft:polished_diorite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json index 2dc3ffbc8..4b4289221 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:diorite" }, - "result": "mineralogy:diorite_smooth_slab", - "count": 2 + "result": { + "id": "mineralogy:diorite_smooth_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:diorite" }, - "result": "minecraft:polished_diorite_slab", - "count": 2 + "result": { + "id": "minecraft:polished_diorite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json index d96c5fa9d..1e5c8bb00 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:polished_diorite" }, - "result": "mineralogy:diorite_smooth_slab", - "count": 2 + "result": { + "id": "mineralogy:diorite_smooth_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:polished_diorite" }, - "result": "minecraft:polished_diorite_slab", - "count": 2 + "result": { + "id": "minecraft:polished_diorite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/polished_granite.json b/src/main/resources/data/minecraft/recipes/polished_granite.json index 84077f02f..be76c3325 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "minecraft:polished_granite", + "id": "minecraft:polished_granite", "count": 1 } } diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab.json index 0827c44f0..94cea7087 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite_slab.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -20,22 +18,20 @@ } }, "result": { - "item": "mineralogy:granite_smooth_slab", + "id": "mineralogy:granite_smooth_slab", "count": 6 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "building", @@ -48,7 +44,7 @@ } }, "result": { - "item": "minecraft:polished_granite_slab", + "id": "minecraft:polished_granite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json index bf8e93316..2bddf5dd8 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:granite" }, - "result": "mineralogy:granite_smooth_slab", - "count": 2 + "result": { + "id": "mineralogy:granite_smooth_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:granite" }, - "result": "minecraft:polished_granite_slab", - "count": 2 + "result": { + "id": "minecraft:polished_granite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json index c3fe951d0..6efbde7de 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json @@ -2,38 +2,38 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:polished_granite" }, - "result": "mineralogy:granite_smooth_slab", - "count": 2 + "result": { + "id": "mineralogy:granite_smooth_slab", + "count": 2 + } } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + }, "recipe": { "type": "minecraft:stonecutting", "ingredient": { "item": "minecraft:polished_granite" }, - "result": "minecraft:polished_granite_slab", - "count": 2 + "result": { + "id": "minecraft:polished_granite_slab", + "count": 2 + } } } ] diff --git a/src/main/resources/data/minecraft/recipes/sentry_armor_trim_smithing_template.json b/src/main/resources/data/minecraft/recipes/sentry_armor_trim_smithing_template.json index 8825efa8e..1b80256f6 100644 --- a/src/main/resources/data/minecraft/recipes/sentry_armor_trim_smithing_template.json +++ b/src/main/resources/data/minecraft/recipes/sentry_armor_trim_smithing_template.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -28,22 +26,20 @@ } }, "result": { - "item": "minecraft:sentry_armor_trim_smithing_template", + "id": "minecraft:sentry_armor_trim_smithing_template", "count": 2 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -64,7 +60,7 @@ } }, "result": { - "item": "minecraft:sentry_armor_trim_smithing_template", + "id": "minecraft:sentry_armor_trim_smithing_template", "count": 2 }, "show_notification": true diff --git a/src/main/resources/data/minecraft/recipes/stone_axe.json b/src/main/resources/data/minecraft/recipes/stone_axe.json index cd17ef0f1..7265b9e8f 100644 --- a/src/main/resources/data/minecraft/recipes/stone_axe.json +++ b/src/main/resources/data/minecraft/recipes/stone_axe.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -25,21 +23,19 @@ } }, "result": { - "item": "minecraft:stone_axe" + "id": "minecraft:stone_axe" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -57,7 +53,7 @@ } }, "result": { - "item": "minecraft:stone_axe" + "id": "minecraft:stone_axe" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/stone_hoe.json b/src/main/resources/data/minecraft/recipes/stone_hoe.json index c3ed31bed..b0ff83edc 100644 --- a/src/main/resources/data/minecraft/recipes/stone_hoe.json +++ b/src/main/resources/data/minecraft/recipes/stone_hoe.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -25,21 +23,19 @@ } }, "result": { - "item": "minecraft:stone_hoe" + "id": "minecraft:stone_hoe" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -57,7 +53,7 @@ } }, "result": { - "item": "minecraft:stone_hoe" + "id": "minecraft:stone_hoe" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/stone_pickaxe.json b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json index ea3ba4693..ec0884775 100644 --- a/src/main/resources/data/minecraft/recipes/stone_pickaxe.json +++ b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -25,21 +23,19 @@ } }, "result": { - "item": "minecraft:stone_pickaxe" + "id": "minecraft:stone_pickaxe" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -57,7 +53,7 @@ } }, "result": { - "item": "minecraft:stone_pickaxe" + "id": "minecraft:stone_pickaxe" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/stone_shovel.json b/src/main/resources/data/minecraft/recipes/stone_shovel.json index b521d4a06..d5d88f6fd 100644 --- a/src/main/resources/data/minecraft/recipes/stone_shovel.json +++ b/src/main/resources/data/minecraft/recipes/stone_shovel.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -25,21 +23,19 @@ } }, "result": { - "item": "minecraft:stone_shovel" + "id": "minecraft:stone_shovel" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -57,7 +53,7 @@ } }, "result": { - "item": "minecraft:stone_shovel" + "id": "minecraft:stone_shovel" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/stone_sword.json b/src/main/resources/data/minecraft/recipes/stone_sword.json index 9e40ec7c6..dd6ebe8a8 100644 --- a/src/main/resources/data/minecraft/recipes/stone_sword.json +++ b/src/main/resources/data/minecraft/recipes/stone_sword.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -25,21 +23,19 @@ } }, "result": { - "item": "minecraft:stone_sword" + "id": "minecraft:stone_sword" }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "equipment", @@ -57,7 +53,7 @@ } }, "result": { - "item": "minecraft:stone_sword" + "id": "minecraft:stone_sword" }, "show_notification": true } diff --git a/src/main/resources/data/minecraft/recipes/vex_armor_trim_smithing_template.json b/src/main/resources/data/minecraft/recipes/vex_armor_trim_smithing_template.json index 0e61d05d0..90cafd341 100644 --- a/src/main/resources/data/minecraft/recipes/vex_armor_trim_smithing_template.json +++ b/src/main/resources/data/minecraft/recipes/vex_armor_trim_smithing_template.json @@ -2,12 +2,10 @@ "type": "forge:conditional", "recipes": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -28,22 +26,20 @@ } }, "result": { - "item": "minecraft:vex_armor_trim_smithing_template", + "id": "minecraft:vex_armor_trim_smithing_template", "count": 2 }, "show_notification": true } }, { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], + "forge:condition": { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + }, "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", @@ -64,7 +60,7 @@ } }, "result": { - "item": "minecraft:vex_armor_trim_smithing_template", + "id": "minecraft:vex_armor_trim_smithing_template", "count": 2 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/advancements/mineralogy/all_the_rocks.json b/src/main/resources/data/mineralogy/advancements/mineralogy/all_the_rocks.json index b1bd93876..9444cdfea 100644 --- a/src/main/resources/data/mineralogy/advancements/mineralogy/all_the_rocks.json +++ b/src/main/resources/data/mineralogy/advancements/mineralogy/all_the_rocks.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "mineralogy:basalt" + "id": "mineralogy:basalt" }, "title": { "translate": "advancements.mineralogy.all_the_rocks.title" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json index a37bbf2a9..0101406d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite" + "items": "#mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json index a6e490c9b..51519699f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_brick" - ] + "items": "mineralogy:amphibolite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json index 6f81a406d..d9ecddab3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/amphibolite/brick" + "items": "#mineralogy:slabs/amphibolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json index 31e9d84f5..76451245b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_brick" - ] + "items": "mineralogy:amphibolite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json index 1f41fce02..e92b2bad5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_brick_slab" - ] + "items": "mineralogy:amphibolite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json index e4376ca92..24f2c165e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_brick_slab" - ] + "items": "mineralogy:amphibolite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json index 994f7653f..3ee5e00b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite/brick" + "items": "#mineralogy:stones/amphibolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json index c91655408..4d68ba75b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_brick_stairs" - ] + "items": "mineralogy:amphibolite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json index b36198493..62ff1b346 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite/brick" + "items": "#mineralogy:stones/amphibolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json index 393339aeb..249f69385 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_brick_wall" - ] + "items": "mineralogy:amphibolite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json index 5bf1b7557..688447d97 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:amphibolite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite" + "items": "#mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json index a07a4aeb7..a44f3add8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/amphibolite" + "items": "#mineralogy:slabs/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json index c85192371..d82a260de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth_brick_slab" - ] + "items": "mineralogy:amphibolite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json index 93112f454..bbfa06f09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth_slab" - ] + "items": "mineralogy:amphibolite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json index 917b39559..d9b7680bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth_slab" - ] + "items": "mineralogy:amphibolite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json index 34ca628f7..6d0a62ae1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth_stairs" - ] + "items": "mineralogy:amphibolite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json index 68518cf0b..c48cc3215 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth_wall" - ] + "items": "mineralogy:amphibolite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json index 75dbd8e17..dceab683c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_slab" - ] + "items": "mineralogy:amphibolite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json index cc02aa248..a152a8edd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_slab" - ] + "items": "mineralogy:amphibolite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json index f44d80253..368f67987 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_slab" - ] + "items": "mineralogy:amphibolite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json index e12845f0e..8b7b38d29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_stairs" - ] + "items": "mineralogy:amphibolite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json index bbfa0e846..2d3c56cdc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_stairs" - ] + "items": "mineralogy:amphibolite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json index 49a62d4ee..69e06eb2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_wall" - ] + "items": "mineralogy:amphibolite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json index fd18dd711..7076669c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:amphibolite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_wall" - ] + "items": "mineralogy:amphibolite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json index 10bf80108..7c83a362d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json index 9d925142c..524abde80 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth" - ] + "items": "mineralogy:amphibolite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json index 4ab020a53..9296ce404 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json index bddd34f1e..cb3e0eb12 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json index d456866b2..f88a89e60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json index 9a3c79b05..f89e21675 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json index 41a1b1a0d..b5205e816 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json index 2aa898975..b04441cd0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json index 003a72342..ffb4e3d89 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json index bcf9778cc..1f16de56f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json index f4e74d8d2..3492f1d37 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_left" - ] + "items": "mineralogy:amphibolite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json index ba37e386f..f849b49e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json index f5bc0a8d4..da61b0573 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_relief_blank" - ] + "items": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json index eb975f5e2..eb0732215 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite" - ] + "items": "mineralogy:amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json index a6482336a..830340bfb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite" + "items": "#mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json index bb7d35545..7c1078ca2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite/smooth" + "items": "#mineralogy:stones/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json index 267dfbd87..456a219e5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/amphibolite/smooth_brick" + "items": "#mineralogy:slabs/amphibolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json index 57a26b4fe..8b333836f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth_brick" - ] + "items": "mineralogy:amphibolite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json index 66bd93eab..fd79f39ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite/smooth_brick" + "items": "#mineralogy:stones/amphibolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json index 696811c44..f740aa1ac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite/smooth_brick" + "items": "#mineralogy:stones/amphibolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json index 7478d9dcf..87755150d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/amphibolite/smooth" + "items": "#mineralogy:slabs/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json index 3285b1720..2946f2860 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite_smooth" - ] + "items": "mineralogy:amphibolite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json index 94e09be9c..8fc13f3c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite/smooth" + "items": "#mineralogy:stones/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json index 29e91d93f..83a52a576 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite/smooth" + "items": "#mineralogy:stones/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json index b5173ff93..31f235664 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite" + "items": "#mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json index 5ff23688e..bf0c821cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite" - ] + "items": "mineralogy:amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json index 855ab439f..2400508da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, "rewards": { "recipes": [ "mineralogy:amphibolite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/amphibolite" + "items": "#mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json index be9ac9137..7c846e969 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, "rewards": { "recipes": [ "mineralogy:andesite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite" + "items": "#mineralogy:stones/andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json index 2e7f7165d..6df1cd736 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_brick" - ] + "items": "mineralogy:andesite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json index cf67dfd02..5178f244f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/andesite/brick" + "items": "#mineralogy:slabs/andesite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json index c68f43d69..cd0748e45 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_brick" - ] + "items": "mineralogy:andesite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json index 3f8080d47..fa83dbeda 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_brick_slab" - ] + "items": "mineralogy:andesite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json index 01515500f..913bdca4f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_brick_slab" - ] + "items": "mineralogy:andesite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json index ae26952fa..cbeccf298 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite/brick" + "items": "#mineralogy:stones/andesite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json index 515c8b3c0..d88aba5fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_brick_stairs" - ] + "items": "mineralogy:andesite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json index 7435797d1..d192b57b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite/brick" + "items": "#mineralogy:stones/andesite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json index 619c5eda9..34779c947 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_brick_wall" - ] + "items": "mineralogy:andesite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json index f67501b68..97c668861 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:andesite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite" + "items": "#mineralogy:stones/andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json index f6b676d50..cfa80c62c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + }, "rewards": { "recipes": [ "mineralogy:andesite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/andesite" + "items": "#mineralogy:slabs/andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json index 39e9d8d71..317bdc85b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth_brick_slab" - ] + "items": "mineralogy:andesite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json index 769fa7cc3..d1ce0486c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth_slab" - ] + "items": "mineralogy:andesite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json index 438bd1d8e..adf036fbb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth_slab" - ] + "items": "mineralogy:andesite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json index efb3514f4..e1893062d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth_stairs" - ] + "items": "mineralogy:andesite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json index c8cce5b76..b619c4e0c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth_wall" - ] + "items": "mineralogy:andesite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json index f066a2044..fe2db9772 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_slab" - ] + "items": "mineralogy:andesite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json index 23e706a16..872adff82 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_slab" - ] + "items": "mineralogy:andesite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json index a4a802457..c529b2268 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_slab" - ] + "items": "mineralogy:andesite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json index 0064a82e8..7676d75a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_stairs" - ] + "items": "mineralogy:andesite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json index d821e843c..dbe2be89c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_stairs" - ] + "items": "mineralogy:andesite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json index 1cfc8b0b9..b39069344 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_wall" - ] + "items": "mineralogy:andesite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json index 438eaf613..587fb81df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_wall" - ] + "items": "mineralogy:andesite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json index 9f90f63e1..ae3a5ab07 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json index 655bc8590..c9a179f29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_blank" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite/smooth" + "items": "#mineralogy:stones/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json index c21dafa09..7ec3d8d38 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json index c2a455f09..2590b7bff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json index c190c49fc..8afd517f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json index 8ba95374c..adee1b65b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json index ca5362afb..99aa1afd8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json index abb84e031..db84d631a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json index afc56e91f..587f8e1f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json index 5131b9f84..be97fe447 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json index f83055b38..6f1082d0c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_left" - ] + "items": "mineralogy:andesite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json index bab82567a..68e629eb5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json index 6c3f0b69b..0f04af2fd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:andesite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_relief_blank" - ] + "items": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json index cde5d7980..506ccbd53 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, "rewards": { "recipes": [ "mineralogy:andesite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite" - ] + "items": "mineralogy:andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json index 0bcd70a68..97ec3c0b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_slab_from_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:andesite_slab" - ] + "items": "minecraft:andesite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json index 509113730..bd4983f8a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_slab_to_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_slab" - ] + "items": "mineralogy:andesite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json index 43d218fa6..bdc97fe75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite" - ] + "items": "mineralogy:andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json index c41e058f6..ed8229fe4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite/smooth" + "items": "#mineralogy:stones/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json index ef6cc81ab..c5d303741 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/andesite/smooth_brick" + "items": "#mineralogy:slabs/andesite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json index acdda6315..f17d3e222 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth_brick" - ] + "items": "mineralogy:andesite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json index a95ec87af..982689247 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite/smooth_brick" + "items": "#mineralogy:stones/andesite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json index dd790036f..81e7e7de1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite/smooth_brick" + "items": "#mineralogy:stones/andesite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json index 09e808090..abb2126ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/andesite/smooth" + "items": "#mineralogy:slabs/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json index fdeeb3042..ed23f2871 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth" - ] + "items": "mineralogy:andesite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json index 2401b7152..d2f9da0ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_slab_from_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:polished_andesite_slab" - ] + "items": "minecraft:polished_andesite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json index acf6a2dde..7ff0c9b9d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_slab_to_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth_slab" - ] + "items": "mineralogy:andesite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json index 6659329cd..37a170536 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_stairs" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite_smooth" - ] + "items": "mineralogy:andesite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json index e909a70e5..bfa3c9bf3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:andesite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/andesite/smooth" + "items": "#mineralogy:stones/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json index 3b87cf84c..3ee4b9c11 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, "rewards": { "recipes": [ "mineralogy:andesite_stairs" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite" - ] + "items": "mineralogy:andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json index fd6dadc30..ba84f16b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite" - ] + "items": "mineralogy:andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json index dbdfb8dff..3dcd75f15 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, "rewards": { "recipes": [ "mineralogy:andesite_wall" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite" - ] + "items": "mineralogy:andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json index a57ff3d58..8cf0b0e0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, "rewards": { "recipes": [ "mineralogy:basalt_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt" + "items": "#mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json index b5d19ed8d..2b467de57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_brick" - ] + "items": "mineralogy:basalt_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json index c343a2ab9..b09dfad9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basalt/brick" + "items": "#mineralogy:slabs/basalt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json index 50fb52505..02d9ed05f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_brick" - ] + "items": "mineralogy:basalt_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json index 6f96d8315..398e7d058 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_brick_slab" - ] + "items": "mineralogy:basalt_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json index 9797b337a..d1f7666ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_brick_slab" - ] + "items": "mineralogy:basalt_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json index 386396827..92dea67a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/brick" + "items": "#mineralogy:stones/basalt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json index 1c38460ee..c780d8050 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_brick_stairs" - ] + "items": "mineralogy:basalt_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json index b6e808485..c61e7a6ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/brick" + "items": "#mineralogy:stones/basalt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json index 3ee92e908..9ba31e6bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_brick_wall" - ] + "items": "mineralogy:basalt_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json index 850f7b00a..3c5c28d57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:basalt_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt" + "items": "#mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json index 9b66f3ee6..a816c9f3e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + }, "rewards": { "recipes": [ "mineralogy:basalt_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basalt" + "items": "#mineralogy:slabs/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json index 5f9cb0433..e56f1e472 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_smooth_brick_slab" - ] + "items": "mineralogy:basalt_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json index 6592f0c0e..1497ab387 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_smooth_slab" - ] + "items": "mineralogy:basalt_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json index 01d9b835b..3da9feb8f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_smooth_slab" - ] + "items": "mineralogy:basalt_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json index acf877e1d..63c1a2d9d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_smooth_stairs" - ] + "items": "mineralogy:basalt_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json index ee06c06d4..5139717c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_smooth_wall" - ] + "items": "mineralogy:basalt_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json index 3230a6728..ac4f1b497 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_slab" - ] + "items": "mineralogy:basalt_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json index 142225681..4926555f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_slab" - ] + "items": "mineralogy:basalt_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json index dafadbb0f..9150338f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_slab" - ] + "items": "mineralogy:basalt_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json index c4ccde1b1..7b73080b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_stairs" - ] + "items": "mineralogy:basalt_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json index 1eced6c90..007407fd8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_stairs" - ] + "items": "mineralogy:basalt_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json index 73c8d0b15..44ab86e4f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_wall" - ] + "items": "mineralogy:basalt_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json index aaaae56b1..9a8aaaad2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basalt_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_wall" - ] + "items": "mineralogy:basalt_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json index a7b2b5765..359c7088d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json index c0707e22b..5e2266979 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_blank" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/smooth" + "items": "#mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json index 518ce9077..e3a4ba138 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json index e684aeae5..74e235f8b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json index 474cea3f8..eb1b9e344 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json index 5d2e20eab..d5037bc84 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json index 6a3720fe2..fd0aa0eb2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json index 8967a2265..09753b131 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json index dab97a6d3..d8f27b10a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json index 2aefc39e4..cc68952a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json index 9ed140743..841577eeb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_left" - ] + "items": "mineralogy:basalt_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json index e68c38367..9e8addfa3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json index 5f0b11e04..04cf6161e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:basalt_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_relief_blank" - ] + "items": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json index 4a3b4e846..0f5111167 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, "rewards": { "recipes": [ "mineralogy:basalt_slab" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt" + "items": "#mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json index 56b8af1e3..eedd16178 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt" - ] + "items": "mineralogy:basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json index 3de75bd88..cf9bee138 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/smooth" + "items": "#mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json index 00e86a9ba..818d3baf5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basalt/smooth_brick" + "items": "#mineralogy:slabs/basalt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json index 30d9c87b5..dfa2d39f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt_smooth_brick" - ] + "items": "mineralogy:basalt_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json index 0f4408d35..e6da5fa0b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/smooth_brick" + "items": "#mineralogy:stones/basalt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json index 61f723597..33c40b57c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/smooth_brick" + "items": "#mineralogy:stones/basalt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json index bb698ada6..48aac3790 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basalt/smooth" + "items": "#mineralogy:slabs/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json index 2a3476a76..7d6073322 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_slab" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/smooth" + "items": "#mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json index 4209e8fe9..5ea2d36c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/smooth" + "items": "#mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json index 8ddcd3713..6bb526254 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:basalt_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt/smooth" + "items": "#mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json index 5f633a54d..a07cbc5c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, "rewards": { "recipes": [ "mineralogy:basalt_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt" + "items": "#mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json index c3fb6048e..159634247 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt" - ] + "items": "mineralogy:basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json index 18d3dd967..0534cc787 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, "rewards": { "recipes": [ "mineralogy:basalt_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basalt" + "items": "#mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json index d8b5ba956..4e223be5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass" + "items": "#mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json index ef0ea088c..386cf0465 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_brick" - ] + "items": "mineralogy:basaltic_glass_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json index 6656b1434..7ff4a46a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basaltic_glass/brick" + "items": "#mineralogy:slabs/basaltic_glass/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json index 2a6959eb7..6042a91bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_brick" - ] + "items": "mineralogy:basaltic_glass_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json index 1ff110b67..cc3090e85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_brick_slab" - ] + "items": "mineralogy:basaltic_glass_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json index 0dc821fed..30ad3b86d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_brick_slab" - ] + "items": "mineralogy:basaltic_glass_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json index d51c9ecca..19ffad160 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass/brick" + "items": "#mineralogy:stones/basaltic_glass/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json index 006d862ec..895abbf3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_brick_stairs" - ] + "items": "mineralogy:basaltic_glass_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json index d31387618..5fd5e735e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass/brick" + "items": "#mineralogy:stones/basaltic_glass/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json index adf8c454d..d53dd1b6d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_brick_wall" - ] + "items": "mineralogy:basaltic_glass_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json index 63c629c60..484b957b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass" + "items": "#mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json index 3d9e14dec..4dac13bff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basaltic_glass" + "items": "#mineralogy:slabs/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json index 09198c855..0f5281d7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth_brick_slab" - ] + "items": "mineralogy:basaltic_glass_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json index 18f3e04ec..ebbcd0fe6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth_slab" - ] + "items": "mineralogy:basaltic_glass_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json index e5d31ea75..17a8d429f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth_slab" - ] + "items": "mineralogy:basaltic_glass_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json index d60ade9ef..6776f153d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth_stairs" - ] + "items": "mineralogy:basaltic_glass_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json index e265154f8..13d38eb63 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth_wall" - ] + "items": "mineralogy:basaltic_glass_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json index d3b5e59a3..c9972d607 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_slab" - ] + "items": "mineralogy:basaltic_glass_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json index f3e09e2ea..877bb4bfa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_slab" - ] + "items": "mineralogy:basaltic_glass_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json index 79714a7a8..12a4be6fd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_slab" - ] + "items": "mineralogy:basaltic_glass_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json index 39074a264..60ba90044 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_stairs" - ] + "items": "mineralogy:basaltic_glass_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json index ca585c02b..4fb892683 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_stairs" - ] + "items": "mineralogy:basaltic_glass_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json index c3a7accf1..e139838c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_wall" - ] + "items": "mineralogy:basaltic_glass_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json index 2b1c7548c..d47cd1ce8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_wall" - ] + "items": "mineralogy:basaltic_glass_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json index 1c4f146ef..4c03534f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json index 679986f73..b63f2a925 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth" - ] + "items": "mineralogy:basaltic_glass_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json index 4b7c048bd..a504a44e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json index 3df7b359b..ff7f6e6a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json index 5db08053f..bb3ab89c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json index 37af144d3..ce95b555c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json index 6a5446667..2657c17c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json index ded17e7d2..3df0cbb9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json index 23fea375a..4b57ca21f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json index 96dbac602..19666ec59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json index 61cc338cf..71587d595 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_left" - ] + "items": "mineralogy:basaltic_glass_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json index 120d04a18..81d293244 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json index e8bc3ffa6..8ccc38196 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_relief_blank" - ] + "items": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json index 05a84eeb1..b78d0481b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass" - ] + "items": "mineralogy:basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json index 2b7f08496..3cccde034 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass" + "items": "#mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json index bdee77269..02fa69ba3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass/smooth" + "items": "#mineralogy:stones/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json index 9de2f21f4..32277293e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" + "items": "#mineralogy:slabs/basaltic_glass/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json index f5f5f26e9..cd6e3c7b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth_brick" - ] + "items": "mineralogy:basaltic_glass_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json index 5aad7d80c..d725172ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + "items": "#mineralogy:stones/basaltic_glass/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json index 71cfbd552..0d06a80ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + "items": "#mineralogy:stones/basaltic_glass/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json index 97e1ea562..e68058a89 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/basaltic_glass/smooth" + "items": "#mineralogy:slabs/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json index 1fc4bf2d1..bd4f587e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass_smooth" - ] + "items": "mineralogy:basaltic_glass_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json index dcba194b3..4eba770a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass/smooth" + "items": "#mineralogy:stones/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json index b9a46fe94..5bb4fe882 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass/smooth" + "items": "#mineralogy:stones/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json index a1e330d36..b1e7a8b67 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass" + "items": "#mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json index 1f20a125b..554ffe8a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass" - ] + "items": "mineralogy:basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json index 66223deda..1c46b4df0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, "rewards": { "recipes": [ "mineralogy:basaltic_glass_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/basaltic_glass" + "items": "#mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json index 9680ce124..b19bf7fae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/chalk.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + }, "rewards": { "recipes": [ "mineralogy:chalk" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:chalk_dust" - ] + "items": "mineralogy:chalk_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json index 5b6ab1115..8f2b606a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk_dust" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + }, "rewards": { "recipes": [ "mineralogy:chalk_dust" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:chalk" - ] + "items": "mineralogy:chalk" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json index eee1bb9d4..6c13bf52a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:cobblestone" @@ -19,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:stone" - ] + "items": "minecraft:stone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json index fdb713f88..2fb6f096d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate" + "items": "#mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json index def72072a..8086f66a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_brick" - ] + "items": "mineralogy:conglomerate_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json index 350e665f2..a7d3f3194 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/conglomerate/brick" + "items": "#mineralogy:slabs/conglomerate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json index 54435c1c3..3b7bc2be9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_brick" - ] + "items": "mineralogy:conglomerate_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json index 3ccb81b9a..cfa625aef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_brick_slab" - ] + "items": "mineralogy:conglomerate_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json index 65c2252d4..d4813230c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_brick_slab" - ] + "items": "mineralogy:conglomerate_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json index 0b1fe9eb5..d5a2e3e44 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate/brick" + "items": "#mineralogy:stones/conglomerate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json index a79a7016b..00b70d8cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_brick_stairs" - ] + "items": "mineralogy:conglomerate_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json index a511c42fa..fb30a2409 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate/brick" + "items": "#mineralogy:stones/conglomerate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json index f919f6700..2394955a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_brick_wall" - ] + "items": "mineralogy:conglomerate_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json index 941a4d261..2e42245ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:conglomerate_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate" + "items": "#mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json index ae3e8fab5..a0322bfcd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/conglomerate" + "items": "#mineralogy:slabs/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json index 893b9f969..ae6f4038a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth_brick_slab" - ] + "items": "mineralogy:conglomerate_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json index e315f5b20..22e745fb4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth_slab" - ] + "items": "mineralogy:conglomerate_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json index c07cb6d07..fd23a873e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth_slab" - ] + "items": "mineralogy:conglomerate_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json index 7de28eed5..29648e53f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth_stairs" - ] + "items": "mineralogy:conglomerate_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json index cfddad624..b25e4b7cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth_wall" - ] + "items": "mineralogy:conglomerate_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json index feaf0ce12..5d3a4ffb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_slab" - ] + "items": "mineralogy:conglomerate_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json index c83dec942..81552a13c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_slab" - ] + "items": "mineralogy:conglomerate_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json index a0748cbaf..474029da0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_slab" - ] + "items": "mineralogy:conglomerate_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json index 12b2172a4..3c15d6e6c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_stairs" - ] + "items": "mineralogy:conglomerate_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json index 38725755d..219ffd8f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_stairs" - ] + "items": "mineralogy:conglomerate_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json index 8bbc7c382..f4614a81b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_wall" - ] + "items": "mineralogy:conglomerate_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json index 9f7eaa2f9..0aac5d227 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:conglomerate_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_wall" - ] + "items": "mineralogy:conglomerate_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json index 256fbf727..7febdd1ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json index 64ffe395f..300266fb3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth" - ] + "items": "mineralogy:conglomerate_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json index 00b170bd1..1e7b0a061 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json index 2de8d9bf6..0dd47993d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json index 95c7a706f..fe53a0c16 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json index bf473b779..ba48bbb10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json index 05cc3f9ed..672051ce7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json index a3cdd8090..363bbea1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json index 256e63708..68f1444eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json index efb164dd4..1747f9dcb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json index 9d6896dc7..35f4780fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_left" - ] + "items": "mineralogy:conglomerate_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json index f30f0d6a7..7f3f788b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json index 5c0ee7140..c722a204a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_relief_blank" - ] + "items": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json index 35c3e5015..ba534831e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate" - ] + "items": "mineralogy:conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json index d1351a3fe..0539f8f69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate" + "items": "#mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json index 31766ac50..7ecf2e874 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate/smooth" + "items": "#mineralogy:stones/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json index 4a7e11dfd..c7dc99b09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/conglomerate/smooth_brick" + "items": "#mineralogy:slabs/conglomerate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json index f992701e2..b1cbbcd2e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth_brick" - ] + "items": "mineralogy:conglomerate_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json index 9d2029323..519a7805b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate/smooth_brick" + "items": "#mineralogy:stones/conglomerate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json index 4a242779a..08528a6e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate/smooth_brick" + "items": "#mineralogy:stones/conglomerate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json index 6ce06c462..3b86ffc5a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/conglomerate/smooth" + "items": "#mineralogy:slabs/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json index cf31fd9e6..9ec255504 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate_smooth" - ] + "items": "mineralogy:conglomerate_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json index 05dc3c98c..9c2a0a143 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate/smooth" + "items": "#mineralogy:stones/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json index 88517d46b..4ee9516f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate/smooth" + "items": "#mineralogy:stones/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json index 42192ca50..b31ff9723 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate" + "items": "#mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json index 3743808aa..e3bef2197 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate" - ] + "items": "mineralogy:conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json index 57bd347b8..26be27911 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, "rewards": { "recipes": [ "mineralogy:conglomerate_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/conglomerate" + "items": "#mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json index d8ed860d4..7b0b4ef21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, "rewards": { "recipes": [ "mineralogy:diabase_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase" + "items": "#mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json index 85ef04356..db70d239b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_brick" - ] + "items": "mineralogy:diabase_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json index 6eb2869a1..eb7b7951f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diabase/brick" + "items": "#mineralogy:slabs/diabase/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json index a6e2052a3..f28d8ff78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_brick" - ] + "items": "mineralogy:diabase_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json index 83dd93f8b..ceed0c77e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_brick_slab" - ] + "items": "mineralogy:diabase_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json index 9e86e9335..c510ff09a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_brick_slab" - ] + "items": "mineralogy:diabase_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json index 5cabd3793..a1b11b9c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase/brick" + "items": "#mineralogy:stones/diabase/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json index a5515dc66..33ae2887b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_brick_stairs" - ] + "items": "mineralogy:diabase_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json index 4b7a7d7d5..bfe17baf3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase/brick" + "items": "#mineralogy:stones/diabase/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json index 75c4a890f..63b1fb126 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_brick_wall" - ] + "items": "mineralogy:diabase_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json index 7839267ae..203730db2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:diabase_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase" + "items": "#mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json index 5a0f01901..724c7cec8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + }, "rewards": { "recipes": [ "mineralogy:diabase_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diabase" + "items": "#mineralogy:slabs/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json index 5e59005a6..25288250c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth_brick_slab" - ] + "items": "mineralogy:diabase_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json index 87a2802a7..27422328c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth_slab" - ] + "items": "mineralogy:diabase_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json index abe1bc3bc..81935f91a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth_slab" - ] + "items": "mineralogy:diabase_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json index 5aa493e1b..44f65d8b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth_stairs" - ] + "items": "mineralogy:diabase_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json index 36406075a..c88ed7207 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth_wall" - ] + "items": "mineralogy:diabase_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json index faf3ef910..155850541 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_slab" - ] + "items": "mineralogy:diabase_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json index e8fba47e1..00d92031b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_slab" - ] + "items": "mineralogy:diabase_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json index fd605da13..dfcae306d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_slab" - ] + "items": "mineralogy:diabase_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json index 700983cd3..f48db1fe7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_stairs" - ] + "items": "mineralogy:diabase_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json index 2e5545747..0bbf55f0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_stairs" - ] + "items": "mineralogy:diabase_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json index d218f7ffb..1b8437fac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_wall" - ] + "items": "mineralogy:diabase_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json index eff526e96..dcd948042 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diabase_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_wall" - ] + "items": "mineralogy:diabase_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json index 4ab5a20c2..60c320ef6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json index 5c68e7856..67ab142db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth" - ] + "items": "mineralogy:diabase_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json index 7abf15842..1a6fc2eee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json index d3e709939..3817fb157 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json index 404c8fe7b..123fc8036 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json index b18bf29f4..05f6c29f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json index 2d2740d63..96686cc94 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json index bdbedb51b..c9f9b101d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json index 2a2127b18..b3a39f0fb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json index f30f274e7..7fa6ca7c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json index 312c4fe53..eb111cfe7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_left" - ] + "items": "mineralogy:diabase_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json index 002ffb089..f02aa7ea0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json index 55c109108..fbf6a0c45 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:diabase_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_relief_blank" - ] + "items": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json index 3e983e70b..9d3e09711 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, "rewards": { "recipes": [ "mineralogy:diabase_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase" - ] + "items": "mineralogy:diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json index 4516d0309..6e37bf009 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase" + "items": "#mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json index c06306130..2cdbd9e90 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase/smooth" + "items": "#mineralogy:stones/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json index badaa729d..497024667 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diabase/smooth_brick" + "items": "#mineralogy:slabs/diabase/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json index 59dfd83f8..2bdfefc8a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth_brick" - ] + "items": "mineralogy:diabase_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json index 6a38fbdaa..77ab4c510 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase/smooth_brick" + "items": "#mineralogy:stones/diabase/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json index d528088c9..bce86fb5d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase/smooth_brick" + "items": "#mineralogy:stones/diabase/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json index 2a0c24e5e..695fb7dc5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diabase/smooth" + "items": "#mineralogy:slabs/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json index c72cd942f..23556d792 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase_smooth" - ] + "items": "mineralogy:diabase_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json index da5b98334..f8a1528a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase/smooth" + "items": "#mineralogy:stones/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json index 9999b4151..91854c614 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:diabase_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase/smooth" + "items": "#mineralogy:stones/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json index c9cfc0c07..c6abde896 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, "rewards": { "recipes": [ "mineralogy:diabase_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase" + "items": "#mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json index 233739244..0b28d5d49 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase" - ] + "items": "mineralogy:diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json index 0a04d28cf..790e0ad8c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, "rewards": { "recipes": [ "mineralogy:diabase_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diabase" + "items": "#mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json index 429d4daa6..efa458078 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, "rewards": { "recipes": [ "mineralogy:diorite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite" + "items": "#mineralogy:stones/diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json index e1140ad25..20b98a677 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_brick" - ] + "items": "mineralogy:diorite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json index 9536b1d8c..27d0f1d80 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diorite/brick" + "items": "#mineralogy:slabs/diorite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json index e0ca077ae..7514360b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_brick" - ] + "items": "mineralogy:diorite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json index 48673cc76..2fed9fe48 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_brick_slab" - ] + "items": "mineralogy:diorite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json index a76ac83e9..b513a4984 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_brick_slab" - ] + "items": "mineralogy:diorite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json index 760b5a1de..e2ee49ce5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite/brick" + "items": "#mineralogy:stones/diorite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json index 402879e82..6dc146fe0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_brick_stairs" - ] + "items": "mineralogy:diorite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json index 12e793d4b..4601ce478 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite/brick" + "items": "#mineralogy:stones/diorite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json index e33a2d0c4..1bcd67e6d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_brick_wall" - ] + "items": "mineralogy:diorite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json index 648a0b410..535c42b35 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:diorite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite" + "items": "#mineralogy:stones/diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json index 4cefecd36..6c06048d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + }, "rewards": { "recipes": [ "mineralogy:diorite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diorite" + "items": "#mineralogy:slabs/diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json index 547e981d4..532b53483 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth_brick_slab" - ] + "items": "mineralogy:diorite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json index ff0fa3638..a22eca3ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth_slab" - ] + "items": "mineralogy:diorite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json index 9f769b632..654799341 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth_slab" - ] + "items": "mineralogy:diorite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json index 837e3680a..b23a305f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth_stairs" - ] + "items": "mineralogy:diorite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json index 7c208e579..72d175887 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth_wall" - ] + "items": "mineralogy:diorite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json index 29010cdbd..4466e1ff1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_slab" - ] + "items": "mineralogy:diorite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json index aab03c93f..dff667443 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_slab" - ] + "items": "mineralogy:diorite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json index 23e73a695..e30fab0a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_slab" - ] + "items": "mineralogy:diorite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json index 8d0a026cc..907765980 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_stairs" - ] + "items": "mineralogy:diorite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json index 9fd864983..fc9be53c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_stairs" - ] + "items": "mineralogy:diorite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json index 0c4494e99..95961fa1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_wall" - ] + "items": "mineralogy:diorite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json index 55068f14d..e2b1aa909 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_wall" - ] + "items": "mineralogy:diorite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json index 51e854d46..5b8ace196 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json index 52337c697..41a512cd6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_blank" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite/smooth" + "items": "#mineralogy:stones/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json index a20d73934..b0092be31 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json index e9693cea4..e075f4eee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json index 3518c8f77..db8c541e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json index f5cd53c80..29ef5fac2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json index 7623a86d9..408b4624c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json index bc18394a5..a5c16d87f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json index 5aad04a4b..c3d85f597 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json index 958f12b2b..2d7dcd455 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json index 4f0cadab7..9856ee476 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_left" - ] + "items": "mineralogy:diorite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json index c33976951..2b8bec5ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json index 5723a1649..0363c6326 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:diorite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_relief_blank" - ] + "items": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json index d058710ed..eed819f04 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, "rewards": { "recipes": [ "mineralogy:diorite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite" - ] + "items": "mineralogy:diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json index e2413cc04..b7e1ea44d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_slab_from_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:diorite_slab" - ] + "items": "minecraft:diorite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json index 8464058e3..d811e034c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_slab_to_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_slab" - ] + "items": "mineralogy:diorite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json index 1bb636998..381a36add 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite" - ] + "items": "mineralogy:diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json index a0a7b6401..82e84d7be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite/smooth" + "items": "#mineralogy:stones/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json index 8cb468b1e..f600e07e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diorite/smooth_brick" + "items": "#mineralogy:slabs/diorite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json index 06cd8c1e2..9ca7a2be3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth_brick" - ] + "items": "mineralogy:diorite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json index 7bc34deaa..247ec2184 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite/smooth_brick" + "items": "#mineralogy:stones/diorite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json index 2b6d38eb3..afc30e7b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite/smooth_brick" + "items": "#mineralogy:stones/diorite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json index f550df25a..cc8f4b649 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/diorite/smooth" + "items": "#mineralogy:slabs/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json index 654b99fcd..6c2eb15a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth" - ] + "items": "mineralogy:diorite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json index ae06067ab..5138653d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_slab_from_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:polished_diorite_slab" - ] + "items": "minecraft:polished_diorite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json index 2fc11af31..03e51d92f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_slab_to_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth_slab" - ] + "items": "mineralogy:diorite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json index 03b2b5cab..48a1a7909 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_stairs" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite_smooth" - ] + "items": "mineralogy:diorite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json index cbaeaf16c..37435891a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:diorite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/diorite/smooth" + "items": "#mineralogy:stones/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json index c2e7519b2..dddef4001 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, "rewards": { "recipes": [ "mineralogy:diorite_stairs" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite" - ] + "items": "mineralogy:diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json index 63884cac6..265d7a8ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite" - ] + "items": "mineralogy:diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json index 539357ec2..bc1121c9d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, "rewards": { "recipes": [ "mineralogy:diorite_wall" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite" - ] + "items": "mineralogy:diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json index 632de50ce..fcf92f95e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite" + "items": "#mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json index f0b866f57..520215560 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_brick" - ] + "items": "mineralogy:dolomite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json index 63628f1e2..a325254c7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/dolomite/brick" + "items": "#mineralogy:slabs/dolomite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json index d7f847426..5dd3b0ac5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_brick" - ] + "items": "mineralogy:dolomite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json index 371aebe4d..8715663c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_brick_slab" - ] + "items": "mineralogy:dolomite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json index e01ac2ebb..53cb1b7d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_brick_slab" - ] + "items": "mineralogy:dolomite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json index 45f4f157d..0d15b0bd5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite/brick" + "items": "#mineralogy:stones/dolomite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json index 36e19ca17..8c9784268 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_brick_stairs" - ] + "items": "mineralogy:dolomite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json index 3800b4862..71af196d7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite/brick" + "items": "#mineralogy:stones/dolomite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json index 80b679928..7c65b1498 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_brick_wall" - ] + "items": "mineralogy:dolomite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json index 9c6ea5f11..1b2720f92 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:dolomite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite" + "items": "#mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json index 09f11031e..637d95ff9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + }, "rewards": { "recipes": [ "mineralogy:dolomite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/dolomite" + "items": "#mineralogy:slabs/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json index bcce1f906..85a8ff5c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth_brick_slab" - ] + "items": "mineralogy:dolomite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json index d5ac7d40e..5a89a9389 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth_slab" - ] + "items": "mineralogy:dolomite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json index df5c1a378..8c36a3830 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth_slab" - ] + "items": "mineralogy:dolomite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json index ab165a0db..dfd917734 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth_stairs" - ] + "items": "mineralogy:dolomite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json index 04c84130f..1d27f7a10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth_wall" - ] + "items": "mineralogy:dolomite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json index 59f73faf5..c590edd4c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_slab" - ] + "items": "mineralogy:dolomite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json index 4c40e62bf..642238c93 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_slab" - ] + "items": "mineralogy:dolomite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json index ce6ee078c..e4f828c0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_slab" - ] + "items": "mineralogy:dolomite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json index 9156e4169..7ce8919b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_stairs" - ] + "items": "mineralogy:dolomite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json index a1b0fb265..347763be7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_stairs" - ] + "items": "mineralogy:dolomite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json index a49fb027c..781b2ded4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_wall" - ] + "items": "mineralogy:dolomite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json index a7f57afe7..97f214957 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:dolomite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_wall" - ] + "items": "mineralogy:dolomite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json index 115eaece4..0e3aedc17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json index 0ba8af6ea..2e50bb58e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth" - ] + "items": "mineralogy:dolomite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json index 4af389b4f..72b26262b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json index 4500250b9..e010d1a4b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json index 92cb4847a..5e31ffeb1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json index a76cc9d39..33ac86d08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json index 4839f2011..de2e96684 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json index fd92ef84f..3131563df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json index fa8f142a6..10567eadc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json index e5f16d5fd..da5d3683b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json index 320dbe80e..29da1f37a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_left" - ] + "items": "mineralogy:dolomite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json index ff9430ce2..c84c7d5cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json index 540f57f7e..585177bd7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:dolomite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_relief_blank" - ] + "items": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json index 4e8b446ae..c8f9c8ac7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, "rewards": { "recipes": [ "mineralogy:dolomite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite" - ] + "items": "mineralogy:dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json index bf98c2a92..d154a1455 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite" + "items": "#mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json index 1ff83d207..6b2c9f3f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite/smooth" + "items": "#mineralogy:stones/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json index ba58a6ed9..4d5b14af9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/dolomite/smooth_brick" + "items": "#mineralogy:slabs/dolomite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json index 009ddbfe7..c6147691f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth_brick" - ] + "items": "mineralogy:dolomite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json index 06252dcc2..62dd33551 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite/smooth_brick" + "items": "#mineralogy:stones/dolomite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json index 6258c4626..1bb1faa19 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite/smooth_brick" + "items": "#mineralogy:stones/dolomite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json index 67e8c63a6..f47bdf435 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/dolomite/smooth" + "items": "#mineralogy:slabs/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json index 68aefc97a..d18de3ced 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite_smooth" - ] + "items": "mineralogy:dolomite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json index 0e794969f..9dfaf7c03 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite/smooth" + "items": "#mineralogy:stones/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json index 12a8892ca..938ef63e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:dolomite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite/smooth" + "items": "#mineralogy:stones/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json index 1e6ab9f2b..a7c40e99a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, "rewards": { "recipes": [ "mineralogy:dolomite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite" + "items": "#mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json index 518064387..6a1bcd48f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite" - ] + "items": "mineralogy:dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json index 69e5f026a..3b23d2b84 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, "rewards": { "recipes": [ "mineralogy:dolomite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/dolomite" + "items": "#mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json index 114738002..2f999e4bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gypsum_dust" - ] + "items": "mineralogy:gypsum_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json index a3c9b85e8..04b1cd16f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_black" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_black" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json index 29841b7ad..c6ce10f4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_blue" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_blue" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json index 046082f1c..6f2530ec8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_brown" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_brown" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json index 32ed077f5..33b5cd576 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_cyan" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_cyan" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json index 36336c3d3..b70aca186 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_gray" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_gray" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json index 3d97a05a9..8830b755c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_green" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_green" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json index d4d056fed..3acfdc278 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_light_blue" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_light_blue" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json index 22a41b276..bb108ee23 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_lime" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_lime" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json index 7fc23f90e..ccc36e323 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_magenta" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_magenta" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json index d682cbffd..0f3159e1d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_orange" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_orange" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json index 9a6dc1356..d2c936218 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_pink" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_pink" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json index c0fcde7e2..2d006e87d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_purple" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_purple" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json index aea5307af..57acc138a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_red" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_red" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json index 77020678c..ffa965ea5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_silver" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_silver" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json index bd33728cd..d66f6bebe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_white" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json index fb958d361..7a75983f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_yellow" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ] + }, "rewards": { "recipes": [ "mineralogy:drywall_yellow" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:drywall_white" - ] + "items": "mineralogy:drywall_white" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json index ea8b917cc..7760c1178 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro" + "items": "#mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json index 7a6dee94a..054c017cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_brick" - ] + "items": "mineralogy:gabbro_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json index f4d01f302..08f88b268 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gabbro/brick" + "items": "#mineralogy:slabs/gabbro/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json index ac6443e69..6f380f9e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_brick" - ] + "items": "mineralogy:gabbro_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json index 43ec9ac68..4d3a5af45 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_brick_slab" - ] + "items": "mineralogy:gabbro_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json index b1abf5e7b..9cae319f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_brick_slab" - ] + "items": "mineralogy:gabbro_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json index 59391c6db..4876ab9a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro/brick" + "items": "#mineralogy:stones/gabbro/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json index 306c94b29..cfeb85c4f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_brick_stairs" - ] + "items": "mineralogy:gabbro_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json index 5d9d8226f..4f5369043 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro/brick" + "items": "#mineralogy:stones/gabbro/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json index cfb1a75e1..d0321a67d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_brick_wall" - ] + "items": "mineralogy:gabbro_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json index 2ae3b75a9..19ebf5158 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:gabbro_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro" + "items": "#mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json index 6d24deb2c..30aa7e746 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + }, "rewards": { "recipes": [ "mineralogy:gabbro_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gabbro" + "items": "#mineralogy:slabs/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json index a4c180618..45c8e4653 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth_brick_slab" - ] + "items": "mineralogy:gabbro_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json index 05eb9be08..57683b14a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth_slab" - ] + "items": "mineralogy:gabbro_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json index df3d7e4da..65e92773d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth_slab" - ] + "items": "mineralogy:gabbro_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json index 9b2f87995..ef3adf87a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth_stairs" - ] + "items": "mineralogy:gabbro_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json index 86ab9354d..7eb5671c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth_wall" - ] + "items": "mineralogy:gabbro_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json index 3cecd66f1..8916aa9d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_slab" - ] + "items": "mineralogy:gabbro_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json index a4b101383..0baa61051 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_slab" - ] + "items": "mineralogy:gabbro_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json index a0d6846c3..88afde6c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_slab" - ] + "items": "mineralogy:gabbro_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json index ac133bc74..56e731138 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_stairs" - ] + "items": "mineralogy:gabbro_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json index bef266416..5c08679b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_stairs" - ] + "items": "mineralogy:gabbro_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json index 324752e0c..bab2b5843 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_wall" - ] + "items": "mineralogy:gabbro_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json index dd88b3dcd..7e2f6f22a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gabbro_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_wall" - ] + "items": "mineralogy:gabbro_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json index 81f673133..99ec3f7ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json index 9780f4fa3..ae76e2e9a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth" - ] + "items": "mineralogy:gabbro_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json index e0dcbdeb9..03c3af54d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json index febc41e0a..1059c79d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json index b91971c44..09ec16320 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json index b36fb35af..b34323531 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json index bab0e1c99..dc8f6c449 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json index 721268854..ca54443f5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json index 290e75d0f..3a1645488 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json index 95137515f..9cc30d601 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json index 37830d054..a783cf195 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_left" - ] + "items": "mineralogy:gabbro_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json index 0e84088d2..bbe99a471 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json index 7233a20f1..e02358d7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:gabbro_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_relief_blank" - ] + "items": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json index 6030e2e6e..21630914d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, "rewards": { "recipes": [ "mineralogy:gabbro_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro" - ] + "items": "mineralogy:gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json index b5fb6d1f5..3a74b0457 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro" + "items": "#mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json index 40895d7f9..c7c52b519 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro/smooth" + "items": "#mineralogy:stones/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json index dd290af5e..8b74c1936 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gabbro/smooth_brick" + "items": "#mineralogy:slabs/gabbro/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json index e974db0b9..4f7078c11 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth_brick" - ] + "items": "mineralogy:gabbro_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json index 519e25b60..19550e4aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro/smooth_brick" + "items": "#mineralogy:stones/gabbro/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json index 9fcd65245..6ee2a262e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro/smooth_brick" + "items": "#mineralogy:stones/gabbro/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json index 5079ec0c4..53a79a3ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gabbro/smooth" + "items": "#mineralogy:slabs/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json index 914569811..2d89d142a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro_smooth" - ] + "items": "mineralogy:gabbro_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json index e0797bf97..ea7e38f6b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro/smooth" + "items": "#mineralogy:stones/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json index 3dd1d08ee..4396e5b5d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:gabbro_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro/smooth" + "items": "#mineralogy:stones/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json index 0f9ebae58..ea3b9fef2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, "rewards": { "recipes": [ "mineralogy:gabbro_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro" + "items": "#mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json index bf9b45fa6..bd758b1b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro" - ] + "items": "mineralogy:gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json index 8788ea962..b53b6eae4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, "rewards": { "recipes": [ "mineralogy:gabbro_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gabbro" + "items": "#mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json index d85cfd663..d91dc69f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss" + "items": "#mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json index d3f425202..b7784729e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_brick" - ] + "items": "mineralogy:gneiss_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json index f25d64cf1..caf10eb4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gneiss/brick" + "items": "#mineralogy:slabs/gneiss/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json index 4f5ffd4af..207529353 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_brick" - ] + "items": "mineralogy:gneiss_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json index a8f7f2696..794126f28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_brick_slab" - ] + "items": "mineralogy:gneiss_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json index 105b7a8c0..da819bc41 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_brick_slab" - ] + "items": "mineralogy:gneiss_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json index 6dd426bca..fbb9c1d88 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss/brick" + "items": "#mineralogy:stones/gneiss/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json index 83a552f4c..bad90a9c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_brick_stairs" - ] + "items": "mineralogy:gneiss_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json index 7e3601eb8..c02ec0225 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss/brick" + "items": "#mineralogy:stones/gneiss/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json index 58639a720..fdb54c55f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_brick_wall" - ] + "items": "mineralogy:gneiss_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json index a230e9260..8c4f6a9d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:gneiss_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss" + "items": "#mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json index 8b2fc752f..549fe65d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + }, "rewards": { "recipes": [ "mineralogy:gneiss_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gneiss" + "items": "#mineralogy:slabs/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json index 509381fc7..f86891055 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth_brick_slab" - ] + "items": "mineralogy:gneiss_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json index 6fb207349..397f5dce9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth_slab" - ] + "items": "mineralogy:gneiss_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json index a028922b8..3a1485acf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth_slab" - ] + "items": "mineralogy:gneiss_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json index a96cde4d3..434841b3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth_stairs" - ] + "items": "mineralogy:gneiss_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json index 68c62ef02..72d70fa28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth_wall" - ] + "items": "mineralogy:gneiss_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json index 22bd7b836..a514ac2ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_slab" - ] + "items": "mineralogy:gneiss_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json index ed4a9395d..05ddec060 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_slab" - ] + "items": "mineralogy:gneiss_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json index 12405be6d..864c4cf83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_slab" - ] + "items": "mineralogy:gneiss_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json index 599f335a8..45086e2b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_stairs" - ] + "items": "mineralogy:gneiss_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json index 2fb22e181..3bb2d8691 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_stairs" - ] + "items": "mineralogy:gneiss_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json index a9f1c586c..ada6de94d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_wall" - ] + "items": "mineralogy:gneiss_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json index b63da0d6d..6edb56b5f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:gneiss_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_wall" - ] + "items": "mineralogy:gneiss_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json index 46168c1c2..dfb583d3e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json index f5d222388..fe37e39c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth" - ] + "items": "mineralogy:gneiss_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json index 9d7cd6fcd..a48661d6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json index 0833215a2..bd5da9654 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json index c75f160ca..f10345cc1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json index 1c3d574b9..f1873926f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json index d85422c3d..0ec9eee45 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json index 88ae9c09a..0c7f1f63a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json index 2f8b3ea1a..c69b6561d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json index 9aab45d11..a84a9f50e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json index 72ea36013..a77dae592 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_left" - ] + "items": "mineralogy:gneiss_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json index a43d6034b..10827aed1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json index f1b750cb8..f32c0a735 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:gneiss_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_relief_blank" - ] + "items": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json index 20d0c96a0..b8cfcdd0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, "rewards": { "recipes": [ "mineralogy:gneiss_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss" - ] + "items": "mineralogy:gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json index 334939721..0548d1e92 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss" + "items": "#mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json index bb1f5a556..666748863 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss/smooth" + "items": "#mineralogy:stones/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json index 297724b53..48f016673 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gneiss/smooth_brick" + "items": "#mineralogy:slabs/gneiss/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json index efe5d3b7e..2728d20ac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth_brick" - ] + "items": "mineralogy:gneiss_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json index 6f4bdaff2..e44d90282 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss/smooth_brick" + "items": "#mineralogy:stones/gneiss/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json index 1d3ab31ec..ddd8b38c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss/smooth_brick" + "items": "#mineralogy:stones/gneiss/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json index b5c3ece58..8fe5d2199 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/gneiss/smooth" + "items": "#mineralogy:slabs/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json index 06a843143..58e3de3cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss_smooth" - ] + "items": "mineralogy:gneiss_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json index aa43d6cc9..1eac24b85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss/smooth" + "items": "#mineralogy:stones/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json index 6cab457a0..bc42947f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:gneiss_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss/smooth" + "items": "#mineralogy:stones/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json index 6709616d3..60fdbb7e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, "rewards": { "recipes": [ "mineralogy:gneiss_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss" + "items": "#mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json index 1ed867835..9ae00f869 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss" - ] + "items": "mineralogy:gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json index 9a0fe7a38..b0ada3b9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, "rewards": { "recipes": [ "mineralogy:gneiss_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/gneiss" + "items": "#mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json index 38f29e88d..61c84d1bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, "rewards": { "recipes": [ "mineralogy:granite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite" + "items": "#mineralogy:stones/granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json index dba139852..bfd356419 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_brick" - ] + "items": "mineralogy:granite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json index 7f3ba6398..b5d14eeb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:granite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/granite/brick" + "items": "#mineralogy:slabs/granite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json index 14e2ad67d..538a5eb64 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:granite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_brick" - ] + "items": "mineralogy:granite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json index eefe8f103..151186c7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_brick_slab" - ] + "items": "mineralogy:granite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json index f1cc7045d..2a2b91fa7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_brick_slab" - ] + "items": "mineralogy:granite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json index 9d27d2151..5d2f754b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:granite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite/brick" + "items": "#mineralogy:stones/granite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json index e585848ea..1bd2d27ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_brick_stairs" - ] + "items": "mineralogy:granite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json index 9644a6426..bc99eae6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:granite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite/brick" + "items": "#mineralogy:stones/granite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json index 90b1fb006..133164dcc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_brick_wall" - ] + "items": "mineralogy:granite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json index 9a571d04f..7d18e69e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:granite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite" + "items": "#mineralogy:stones/granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json index 0cf82d426..499eaf5c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + }, "rewards": { "recipes": [ "mineralogy:granite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/granite" + "items": "#mineralogy:slabs/granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json index 0e21554f0..41faf0b57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth_brick_slab" - ] + "items": "mineralogy:granite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json index 26710b74b..dd763c0c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth_slab" - ] + "items": "mineralogy:granite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json index d548ca703..446e5db93 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth_slab" - ] + "items": "mineralogy:granite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json index fde660351..640da89a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth_stairs" - ] + "items": "mineralogy:granite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json index b3f541a41..73e3867aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth_wall" - ] + "items": "mineralogy:granite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json index 9ac66e758..12386f549 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_slab" - ] + "items": "mineralogy:granite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json index d382429bc..b5b560191 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_slab" - ] + "items": "mineralogy:granite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json index 7d7129110..c6839174a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_slab" - ] + "items": "mineralogy:granite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json index 9247b61eb..ab05bc821 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_stairs" - ] + "items": "mineralogy:granite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json index d4a12a00c..2691e69f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_stairs" - ] + "items": "mineralogy:granite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json index 97679b818..8501f8533 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_wall" - ] + "items": "mineralogy:granite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json index 7f59f1280..fa4d9f768 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_wall" - ] + "items": "mineralogy:granite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json index fad4435ea..925f5b1c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json index b19a2de1a..f4039ca04 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_blank" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite/smooth" + "items": "#mineralogy:stones/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json index e2dd6d501..72d73785a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json index 50fef1456..07887da70 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json index c684af745..d357fcfa8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json index 6c8123933..98a82119c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json index 7d9a584fc..aab36bbe2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json index 4c3df67a7..e3d476e08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json index ee7e192f5..370ec9414 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json index 5c7c33c7b..597139942 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json index 14656b4db..84e8df915 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_left" - ] + "items": "mineralogy:granite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json index 23d3383e0..7218b3d44 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json index 911639bbf..8e6f768f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:granite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_relief_blank" - ] + "items": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json index dddcaed5f..3d591c50b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, "rewards": { "recipes": [ "mineralogy:granite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite" - ] + "items": "mineralogy:granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json index 5ec1ee649..8c3be6d42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_slab_from_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:granite_slab" - ] + "items": "minecraft:granite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json index 01ff91b33..f4cb1680a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_slab_to_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_slab" - ] + "items": "mineralogy:granite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json index 6a5c61bfd..d18c7b401 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite" - ] + "items": "mineralogy:granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json index b16f69544..cf2dbbb9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite/smooth" + "items": "#mineralogy:stones/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json index 4dcfc4073..6c4395b9a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/granite/smooth_brick" + "items": "#mineralogy:slabs/granite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json index 402223831..a8ffe2ec7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth_brick" - ] + "items": "mineralogy:granite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json index 51f558e09..84d27fefe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite/smooth_brick" + "items": "#mineralogy:stones/granite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json index 119af7344..4dcec9325 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite/smooth_brick" + "items": "#mineralogy:stones/granite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json index 8ea37e3bc..17768d08a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/granite/smooth" + "items": "#mineralogy:slabs/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json index fb2853a3a..482dd213d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth" - ] + "items": "mineralogy:granite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json index ede52df43..57518fe76 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_slab_from_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:polished_granite_slab" - ] + "items": "minecraft:polished_granite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json index b09fe228f..32959d6fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_slab_to_vanilla" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth_slab" - ] + "items": "mineralogy:granite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json index 5b40a0da7..c9dc4c9f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_stairs" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite_smooth" - ] + "items": "mineralogy:granite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json index c74c0a5df..6206fe26b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:granite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/granite/smooth" + "items": "#mineralogy:stones/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json index af321245e..8a63b8668 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, "rewards": { "recipes": [ "mineralogy:granite_stairs" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite" - ] + "items": "mineralogy:granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json index 6e2eeaab4..fc76792e5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite" - ] + "items": "mineralogy:granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json index 0dc0e6946..04fd9fc0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, "rewards": { "recipes": [ "mineralogy:granite_wall" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite" - ] + "items": "mineralogy:granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json index 9ad4a01fd..3ba6fa2df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "SMELTABLE_GRAVEL" - } - ], "rewards": { "recipes": [ "mineralogy:gravel_to_stone" @@ -22,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gravel" - ] + "items": "minecraft:gravel" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json index 9c958359c..9a4c5a810 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json @@ -1,17 +1,20 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/carbon" - } - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/carbon" + } + } + ] + }, "rewards": { "recipes": [ "mineralogy:gunpowder_from_carbon_dust" @@ -29,9 +32,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:nitrate_dust" - ] + "items": "mineralogy:nitrate_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json index 2c7390016..16faff7be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, "rewards": { "recipes": [ "mineralogy:gunpowder_from_charcoal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:nitrate_dust" - ] + "items": "mineralogy:nitrate_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json index d1f6f53a2..c991417b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json @@ -1,17 +1,20 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/coal" - } - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ] + }, "rewards": { "recipes": [ "mineralogy:gunpowder_from_coal_dust" @@ -29,9 +32,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:nitrate_dust" - ] + "items": "mineralogy:nitrate_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json index 4110c7ab7..22c84d38c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, "rewards": { "recipes": [ "mineralogy:gunpowder_from_sugar" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:nitrate_dust" - ] + "items": "mineralogy:nitrate_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json index 728ae110c..abe5a71eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + }, "rewards": { "recipes": [ "mineralogy:gypsum" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gypsum_dust" - ] + "items": "mineralogy:gypsum_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json index 5016dffc8..f338b5b60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum_dust" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + }, "rewards": { "recipes": [ "mineralogy:gypsum_dust" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gypsum" - ] + "items": "mineralogy:gypsum" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json index 77842cf3e..09d392ece 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels" + "items": "#mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json index 657216c92..61c7b5fb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_brick" - ] + "items": "mineralogy:hornfels_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json index 32f083853..ad86b85e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/hornfels/brick" + "items": "#mineralogy:slabs/hornfels/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json index 04fb576bb..396be2c1e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_brick" - ] + "items": "mineralogy:hornfels_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json index d9d4f3018..4f8782da9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_brick_slab" - ] + "items": "mineralogy:hornfels_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json index 1daf6dd33..b15a07fa8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_brick_slab" - ] + "items": "mineralogy:hornfels_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json index 2bb759e51..8c386f065 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels/brick" + "items": "#mineralogy:stones/hornfels/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json index 74ac64de2..f5169e82f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_brick_stairs" - ] + "items": "mineralogy:hornfels_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json index d993fbc1b..b9d1bcec7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels/brick" + "items": "#mineralogy:stones/hornfels/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json index a5da80449..0812ce5b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_brick_wall" - ] + "items": "mineralogy:hornfels_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json index 3cd182fbc..c8f6dc40b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:hornfels_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels" + "items": "#mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json index 3199ee4bf..fa7b467e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + }, "rewards": { "recipes": [ "mineralogy:hornfels_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/hornfels" + "items": "#mineralogy:slabs/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json index 65644baf8..ba9eedb89 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth_brick_slab" - ] + "items": "mineralogy:hornfels_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json index b69cbd896..dc39578db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth_slab" - ] + "items": "mineralogy:hornfels_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json index 3e0a810fa..e33bdd08f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth_slab" - ] + "items": "mineralogy:hornfels_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json index 2d3977b0f..32dd07326 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth_stairs" - ] + "items": "mineralogy:hornfels_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json index 7850268d0..c9562be0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth_wall" - ] + "items": "mineralogy:hornfels_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json index fafa49e47..d38ac175a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_slab" - ] + "items": "mineralogy:hornfels_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json index 7a142c19e..01ef57368 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_slab" - ] + "items": "mineralogy:hornfels_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json index 2ed37dd24..736b23755 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_slab" - ] + "items": "mineralogy:hornfels_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json index fcc88c0ad..eddec001a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_stairs" - ] + "items": "mineralogy:hornfels_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json index c7349e832..ef07ae966 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_stairs" - ] + "items": "mineralogy:hornfels_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json index c91cfaf30..ff4cb8d2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_wall" - ] + "items": "mineralogy:hornfels_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json index 0b781bcc5..18f88a1ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:hornfels_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_wall" - ] + "items": "mineralogy:hornfels_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json index 8a7e3d850..114ad0d23 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json index fc6231db4..e8403a5c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth" - ] + "items": "mineralogy:hornfels_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json index 5a0d9842a..d378e49c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json index 01968a04b..3f9a5ed5a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json index 27183ca46..deba9899c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json index 2072c0da1..372b0ec29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json index cf1d04dd7..96ab9088b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json index 0eabcc6ed..700aefcc9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json index 270e322f2..c4e6a1ee8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json index c034243ab..85dcdd5cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json index a2bb4d3c4..686f4f745 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_left" - ] + "items": "mineralogy:hornfels_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json index df05d6d26..fd2990061 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json index 315665e87..b8ba502b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:hornfels_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_relief_blank" - ] + "items": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json index f116e05c2..283fd9ce0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, "rewards": { "recipes": [ "mineralogy:hornfels_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels" - ] + "items": "mineralogy:hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json index 6e3c7e876..fd072825e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels" + "items": "#mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json index 7e501fb6a..f95fbb628 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels/smooth" + "items": "#mineralogy:stones/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json index ebbff7f54..0f1383dae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/hornfels/smooth_brick" + "items": "#mineralogy:slabs/hornfels/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json index ea4bbd9e6..bf46e9bf1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth_brick" - ] + "items": "mineralogy:hornfels_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json index 305311dde..31d1b01a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels/smooth_brick" + "items": "#mineralogy:stones/hornfels/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json index 2581cbe09..4ca8b4c69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels/smooth_brick" + "items": "#mineralogy:stones/hornfels/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json index 1961c13dd..f5849d8ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/hornfels/smooth" + "items": "#mineralogy:slabs/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json index e50b519f7..3c0862eab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels_smooth" - ] + "items": "mineralogy:hornfels_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json index 619d5a4fd..42052ead8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels/smooth" + "items": "#mineralogy:stones/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json index 5ae518874..032b51368 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:hornfels_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels/smooth" + "items": "#mineralogy:stones/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json index c5d08c7fd..46ba42158 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, "rewards": { "recipes": [ "mineralogy:hornfels_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels" + "items": "#mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json index b3b7d9910..339ae3ead 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels" - ] + "items": "mineralogy:hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json index 940c6b729..8526c0277 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, "rewards": { "recipes": [ "mineralogy:hornfels_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/hornfels" + "items": "#mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json index 22af084bf..55e273227 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, "rewards": { "recipes": [ "mineralogy:limestone_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone" + "items": "#mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json index f920f0694..0dc51d69c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_brick" - ] + "items": "mineralogy:limestone_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json index d013cae8b..e0d8c2220 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/limestone/brick" + "items": "#mineralogy:slabs/limestone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json index 8e0cf4bff..b4ef130b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_brick" - ] + "items": "mineralogy:limestone_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json index 574aee56e..a90e4be04 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_brick_slab" - ] + "items": "mineralogy:limestone_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json index 05751b5d5..34f8aa7ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_brick_slab" - ] + "items": "mineralogy:limestone_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json index 96ed699fc..147a7adf4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone/brick" + "items": "#mineralogy:stones/limestone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json index 8125f88fa..02fc41868 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_brick_stairs" - ] + "items": "mineralogy:limestone_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json index d9270faf9..28eb1e0a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone/brick" + "items": "#mineralogy:stones/limestone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json index c0434e2c8..84a93eba5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_brick_wall" - ] + "items": "mineralogy:limestone_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json index 1122f8474..852d420c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:limestone_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone" + "items": "#mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json index 55c3d82ad..2049ba8ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + }, "rewards": { "recipes": [ "mineralogy:limestone_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/limestone" + "items": "#mineralogy:slabs/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json index 55ec2f091..7801f5a7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth_brick_slab" - ] + "items": "mineralogy:limestone_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json index 9b1fdf971..644330e14 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth_slab" - ] + "items": "mineralogy:limestone_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json index 8581b3b54..4c3c95015 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth_slab" - ] + "items": "mineralogy:limestone_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json index 9dec26495..6d8859b9d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth_stairs" - ] + "items": "mineralogy:limestone_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json index f6551799b..d6b35f95c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth_wall" - ] + "items": "mineralogy:limestone_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json index 7f498bc92..409b72005 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_slab" - ] + "items": "mineralogy:limestone_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json index dac6f95b2..083317684 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_slab" - ] + "items": "mineralogy:limestone_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json index b4b5c1c27..ee3d0718e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_slab" - ] + "items": "mineralogy:limestone_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json index d2d240d07..db4aae2a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_stairs" - ] + "items": "mineralogy:limestone_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json index 1c222d7b2..898a5d3ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_stairs" - ] + "items": "mineralogy:limestone_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json index 90d9ac55f..738361b6f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_wall" - ] + "items": "mineralogy:limestone_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json index 637f4ecfd..a27504e2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:limestone_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_wall" - ] + "items": "mineralogy:limestone_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json index 056f28799..fd04bd509 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json index c5a50eaac..f74af9fbb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth" - ] + "items": "mineralogy:limestone_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json index 64af2a188..031d2b933 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json index 8f1f88cf9..f2d8b0d83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json index cf61e779f..150ce76e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json index 8087d9e69..bf658dde2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json index e9ade5d60..a07efb704 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json index 2b9336ca3..22c37c2df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json index 14be09648..044e96e61 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json index a1fd48ae3..2727bbcf2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json index 5e9db046a..f865a8b9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_left" - ] + "items": "mineralogy:limestone_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json index 0e2f42cb3..722185fc3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json index 1f0a90664..ec8fd7f82 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:limestone_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_relief_blank" - ] + "items": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json index a4e867621..40bd0facf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, "rewards": { "recipes": [ "mineralogy:limestone_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone" - ] + "items": "mineralogy:limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json index d7c14aaf1..d3a1a94fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone" + "items": "#mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json index a9701c052..3130647a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone/smooth" + "items": "#mineralogy:stones/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json index 5821b9d6e..8269de510 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/limestone/smooth_brick" + "items": "#mineralogy:slabs/limestone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json index cdb49a607..62f73166b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth_brick" - ] + "items": "mineralogy:limestone_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json index db0be55c7..63ef2fe26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone/smooth_brick" + "items": "#mineralogy:stones/limestone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json index 017891c7b..96b3a4c78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone/smooth_brick" + "items": "#mineralogy:stones/limestone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json index 23f5b3940..bf4dcbc96 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/limestone/smooth" + "items": "#mineralogy:slabs/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json index ca9e83738..84a69b7a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone_smooth" - ] + "items": "mineralogy:limestone_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json index 8292b5ad5..8db08d3b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone/smooth" + "items": "#mineralogy:stones/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json index 1dab2d9bf..7188316fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:limestone_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone/smooth" + "items": "#mineralogy:stones/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json index c2cadff04..8a7950ee4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, "rewards": { "recipes": [ "mineralogy:limestone_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone" + "items": "#mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json index f22aea8d8..de47f7f56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone" - ] + "items": "mineralogy:limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json index 31b8e36f6..fd9302e9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, "rewards": { "recipes": [ "mineralogy:limestone_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/limestone" + "items": "#mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json index 9201e8be5..54dd0afe2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, "rewards": { "recipes": [ "mineralogy:marble_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble" + "items": "#mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json index 932a0d0b4..8132fa358 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_brick" - ] + "items": "mineralogy:marble_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json index 0eea0cc3e..bf7b3268a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:marble_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/marble/brick" + "items": "#mineralogy:slabs/marble/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json index 14fa3c202..6da2ce090 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:marble_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_brick" - ] + "items": "mineralogy:marble_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json index 8417ccdbc..01b771d30 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_brick_slab" - ] + "items": "mineralogy:marble_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json index 62c261b7a..39b5a397a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_brick_slab" - ] + "items": "mineralogy:marble_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json index bea5d0a96..f59236062 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:marble_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble/brick" + "items": "#mineralogy:stones/marble/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json index c2aa15a51..e799d2d21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_brick_stairs" - ] + "items": "mineralogy:marble_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json index 6adae3d34..f092fe9a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:marble_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble/brick" + "items": "#mineralogy:stones/marble/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json index e8a32495f..4608e6dcb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_brick_wall" - ] + "items": "mineralogy:marble_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json index 73e271ae4..30016c156 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:marble_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble" + "items": "#mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json index f7a427ee1..5aad12922 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + }, "rewards": { "recipes": [ "mineralogy:marble_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/marble" + "items": "#mineralogy:slabs/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json index 920571abe..bd63af935 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth_brick_slab" - ] + "items": "mineralogy:marble_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json index 81c7b8b94..8a7c1875c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth_slab" - ] + "items": "mineralogy:marble_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json index 7c6254366..1348b18d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth_slab" - ] + "items": "mineralogy:marble_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json index d34f8aef9..8650fa2c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth_stairs" - ] + "items": "mineralogy:marble_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json index e92c9fcfe..8c011249d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth_wall" - ] + "items": "mineralogy:marble_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json index 8ee61f804..88af45622 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_slab" - ] + "items": "mineralogy:marble_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json index da1ec49a0..32c166e5c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_slab" - ] + "items": "mineralogy:marble_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json index 94f9c40a1..3ae3517cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_slab" - ] + "items": "mineralogy:marble_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json index a3480eb56..537a6f018 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_stairs" - ] + "items": "mineralogy:marble_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json index 7ba919fb2..e4f5c26f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_stairs" - ] + "items": "mineralogy:marble_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json index d2bba5cad..5c875720b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_wall" - ] + "items": "mineralogy:marble_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json index 06e4c74d5..7dd10915f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:marble_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_wall" - ] + "items": "mineralogy:marble_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json index 080853cc1..0bac3a00f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json index cb9ec05ab..5c7e48529 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth" - ] + "items": "mineralogy:marble_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json index 15879ab3a..9bbb59687 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json index f729bb2c4..ea2536238 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json index 738080c89..e828f70a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json index 450e86c81..b9435c188 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json index e3df51843..90ba3718c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json index 4eb63d21e..32db8df1f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json index d76ad8067..e528c1f02 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json index 01e9e6ad5..4afd0e02b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json index 8afe53ffa..161584a49 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_left" - ] + "items": "mineralogy:marble_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json index 68f06ff90..c20be25b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json index 0ce408012..c14e8ed10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:marble_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_relief_blank" - ] + "items": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json index 502dd641a..94e9a1f53 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, "rewards": { "recipes": [ "mineralogy:marble_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble" - ] + "items": "mineralogy:marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json index bcb38469a..1daab9377 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble" + "items": "#mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json index 04243b82c..264c85f9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble/smooth" + "items": "#mineralogy:stones/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json index bbf469715..9aecd37aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/marble/smooth_brick" + "items": "#mineralogy:slabs/marble/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json index d1e78b37c..ad0971496 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth_brick" - ] + "items": "mineralogy:marble_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json index 4f3ed8004..f236a5f7b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble/smooth_brick" + "items": "#mineralogy:stones/marble/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json index e14a229b1..ec43a2b46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble/smooth_brick" + "items": "#mineralogy:stones/marble/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json index ede428446..20c458533 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/marble/smooth" + "items": "#mineralogy:slabs/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json index e765a7abc..b122d4dba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble_smooth" - ] + "items": "mineralogy:marble_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json index 4d157dd16..0e309dd52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble/smooth" + "items": "#mineralogy:stones/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json index 576cd1774..a864ddc5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:marble_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble/smooth" + "items": "#mineralogy:stones/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json index 3e59563c5..4b6aa6715 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, "rewards": { "recipes": [ "mineralogy:marble_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble" + "items": "#mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json index 661ca1266..cbf0b9568 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble" - ] + "items": "mineralogy:marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json index 9fe4ca04d..6f188c752 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, "rewards": { "recipes": [ "mineralogy:marble_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/marble" + "items": "#mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json index a9f6ee85b..b4c3aad3c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_FERTILIZER" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:mineral_fertilizer" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ] + }, "rewards": { "recipes": [ "mineralogy:mineralfertilizer" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:nitrate_dust" - ] + "items": "mineralogy:nitrate_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json index ec1136fa9..04260f445 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_block" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ] + }, "rewards": { "recipes": [ "mineralogy:nitrate_block" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:nitrate_dust" - ] + "items": "mineralogy:nitrate_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json index 055cd33ec..3f85628ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_dust" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ] + }, "rewards": { "recipes": [ "mineralogy:nitrate_dust" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:nitrate_block" - ] + "items": "mineralogy:nitrate_block" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json index ae1ca1573..23ccddd16 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite" + "items": "#mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json index 8c9765a82..8ec5989c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_brick" - ] + "items": "mineralogy:novaculite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json index 035d9d88c..5d6cdb9d7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/novaculite/brick" + "items": "#mineralogy:slabs/novaculite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json index 01cc06dab..8bbe07a88 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_brick" - ] + "items": "mineralogy:novaculite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json index 958386f26..20c792666 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_brick_slab" - ] + "items": "mineralogy:novaculite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json index c097851a5..d7fcbf40b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_brick_slab" - ] + "items": "mineralogy:novaculite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json index 891e9cd15..e835503b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite/brick" + "items": "#mineralogy:stones/novaculite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json index 2663978b5..92b00cb18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_brick_stairs" - ] + "items": "mineralogy:novaculite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json index cf06657ad..31f76e4db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite/brick" + "items": "#mineralogy:stones/novaculite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json index 6d9404b38..eed8175c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_brick_wall" - ] + "items": "mineralogy:novaculite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json index 05960c1a4..30dedb9b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:novaculite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite" + "items": "#mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json index 4d73be79c..fc4de3114 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + }, "rewards": { "recipes": [ "mineralogy:novaculite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/novaculite" + "items": "#mineralogy:slabs/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json index 54bbc318b..4c1f6dfa1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth_brick_slab" - ] + "items": "mineralogy:novaculite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json index 614788e31..01f025d07 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth_slab" - ] + "items": "mineralogy:novaculite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json index a65b88e16..984ae9cb2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth_slab" - ] + "items": "mineralogy:novaculite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json index 9eff63b0c..354a360e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth_stairs" - ] + "items": "mineralogy:novaculite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json index 44f16a56c..eaf13ef1e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth_wall" - ] + "items": "mineralogy:novaculite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json index 9b36f61f1..349468303 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_slab" - ] + "items": "mineralogy:novaculite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json index f916d9b43..172189f54 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_slab" - ] + "items": "mineralogy:novaculite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json index d8015257b..0ffcb8d0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_slab" - ] + "items": "mineralogy:novaculite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json index 2d370c249..d40b3bda2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_stairs" - ] + "items": "mineralogy:novaculite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json index 752ab0fd8..4aa3dd918 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_stairs" - ] + "items": "mineralogy:novaculite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json index 860a73419..60f84281b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_wall" - ] + "items": "mineralogy:novaculite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json index 91a26e549..b7a0d0cdc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:novaculite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_wall" - ] + "items": "mineralogy:novaculite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json index 17d782849..d86c6f4f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json index 688d87c5c..ddb03a97a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth" - ] + "items": "mineralogy:novaculite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json index 2e2efd4b1..7bb0b21b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json index 95363c37e..b4cafe5cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json index fd95c5a73..bd88dc6ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json index 5d3403ed7..5e8927006 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json index 0186d1cea..0b78fafb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json index 116346d97..e630f511e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json index 75b7ee584..b365448b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json index f03e88e80..690f77653 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json index 06a11806f..fa0eacb42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_left" - ] + "items": "mineralogy:novaculite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json index bb0d5946b..733c69422 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json index a45508bf6..0f4121fc4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:novaculite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_relief_blank" - ] + "items": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json index 83ab67d29..cf486fa54 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, "rewards": { "recipes": [ "mineralogy:novaculite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite" - ] + "items": "mineralogy:novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json index 0e360f683..e03c94aac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite" + "items": "#mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json index 11297c590..ba0bb4be0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite/smooth" + "items": "#mineralogy:stones/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json index fa7d4901d..d752164eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/novaculite/smooth_brick" + "items": "#mineralogy:slabs/novaculite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json index f30b1a2ed..b77abb023 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth_brick" - ] + "items": "mineralogy:novaculite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json index 04a839fbe..ba9e02d9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite/smooth_brick" + "items": "#mineralogy:stones/novaculite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json index 52e2c2026..3fb1694d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite/smooth_brick" + "items": "#mineralogy:stones/novaculite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json index c9ae53856..afb50c8e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/novaculite/smooth" + "items": "#mineralogy:slabs/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json index 74baf1d56..6c2504f37 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite_smooth" - ] + "items": "mineralogy:novaculite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json index f5043244d..49641f7d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite/smooth" + "items": "#mineralogy:stones/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json index 037b1abf2..c35371231 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:novaculite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite/smooth" + "items": "#mineralogy:stones/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json index 71ecd45e9..02183d422 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, "rewards": { "recipes": [ "mineralogy:novaculite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite" + "items": "#mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json index 793c8c634..570789c97 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite" - ] + "items": "mineralogy:novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json index 3d9226cc9..b38a3a0c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, "rewards": { "recipes": [ "mineralogy:novaculite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/novaculite" + "items": "#mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json index 7e9d6bf3d..d445ee1b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite" + "items": "#mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json index 853c274ae..c92235c95 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_brick" - ] + "items": "mineralogy:pegmatite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json index b2e2f1ed2..c31b80886 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/pegmatite/brick" + "items": "#mineralogy:slabs/pegmatite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json index 1cf1ffaae..af3dc9fad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_brick" - ] + "items": "mineralogy:pegmatite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json index af0f954f9..7d7bf75ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_brick_slab" - ] + "items": "mineralogy:pegmatite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json index 5bdbffb3d..68627b33e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_brick_slab" - ] + "items": "mineralogy:pegmatite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json index 89bde2db3..560003278 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite/brick" + "items": "#mineralogy:stones/pegmatite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json index c6643da8b..715df2248 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_brick_stairs" - ] + "items": "mineralogy:pegmatite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json index 3c0c05b48..d096bb04b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite/brick" + "items": "#mineralogy:stones/pegmatite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json index 38e7f6028..9b4848c02 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_brick_wall" - ] + "items": "mineralogy:pegmatite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json index d7af1dc58..b0ce40915 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:pegmatite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite" + "items": "#mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json index fc435fdbd..2157d06c7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/pegmatite" + "items": "#mineralogy:slabs/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json index 515b052f6..bc6b53a50 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth_brick_slab" - ] + "items": "mineralogy:pegmatite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json index f807ec779..78c1fa281 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth_slab" - ] + "items": "mineralogy:pegmatite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json index 7064fb53d..5c7287e64 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth_slab" - ] + "items": "mineralogy:pegmatite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json index 5fbdf554d..aab380348 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth_stairs" - ] + "items": "mineralogy:pegmatite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json index e2d966eb2..299cf0608 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth_wall" - ] + "items": "mineralogy:pegmatite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json index 5b4463a4a..26551e41a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_slab" - ] + "items": "mineralogy:pegmatite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json index e3a4bbb3b..d98c15378 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_slab" - ] + "items": "mineralogy:pegmatite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json index 081f493a2..f726cd9c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_slab" - ] + "items": "mineralogy:pegmatite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json index e63bd02ef..15dab18f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_stairs" - ] + "items": "mineralogy:pegmatite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json index 5ca43311b..a0566466d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_stairs" - ] + "items": "mineralogy:pegmatite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json index 86c3219c9..efbd7de76 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_wall" - ] + "items": "mineralogy:pegmatite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json index b3ba43624..a9627d19d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:pegmatite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_wall" - ] + "items": "mineralogy:pegmatite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json index b7d57f1d0..bba28230e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json index 69791dc3f..95792a05d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth" - ] + "items": "mineralogy:pegmatite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json index 964e4b745..c4961a403 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json index d8d4750e3..3fff78041 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json index aaba1ea45..b41fc976a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json index 8cc6122f2..eda988a39 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json index 6727969dd..3c2904621 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json index 9b8ae0055..43d162067 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json index ded8da00e..91116c173 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json index 87f5bfc73..44526d0e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json index 992a8b711..8f3a5f74a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_left" - ] + "items": "mineralogy:pegmatite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json index a11a5d81f..31aec7f5e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json index 49beafffa..9f6886ecb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_relief_blank" - ] + "items": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json index b1a35ebd6..6ada1f23d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite" - ] + "items": "mineralogy:pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json index 4394e5122..541bf3a9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite" + "items": "#mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json index 558e2893e..39fe1c088 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite/smooth" + "items": "#mineralogy:stones/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json index 8d4701e1d..610b0425c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/pegmatite/smooth_brick" + "items": "#mineralogy:slabs/pegmatite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json index 66b1ed5fc..05e849e99 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth_brick" - ] + "items": "mineralogy:pegmatite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json index 3d4b5a063..a3cd5017f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite/smooth_brick" + "items": "#mineralogy:stones/pegmatite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json index 8a8db31b4..032505ee7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite/smooth_brick" + "items": "#mineralogy:stones/pegmatite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json index 82e37d294..29c746dbf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/pegmatite/smooth" + "items": "#mineralogy:slabs/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json index 973c0f570..4fd74458f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite_smooth" - ] + "items": "mineralogy:pegmatite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json index 309dc7487..56a5ac4c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite/smooth" + "items": "#mineralogy:stones/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json index 69ba70ccd..96599fcb1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite/smooth" + "items": "#mineralogy:stones/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json index 73873dcd3..14c8bb750 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite" + "items": "#mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json index f3d889b8a..7c13ab209 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite" - ] + "items": "mineralogy:pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json index ef25da50a..d72a01702 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, "rewards": { "recipes": [ "mineralogy:pegmatite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/pegmatite" + "items": "#mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json index 4a9bfb502..bd83b61ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite" + "items": "#mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json index 9afd9c36b..b7eb7f68b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_brick" - ] + "items": "mineralogy:peridotite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json index bc14749a5..5aab45397 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/peridotite/brick" + "items": "#mineralogy:slabs/peridotite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json index 13203b299..92e8c9a78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_brick" - ] + "items": "mineralogy:peridotite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json index 6b77c310d..d33cbdb43 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_brick_slab" - ] + "items": "mineralogy:peridotite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json index 29fcaef16..bd3f2172a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_brick_slab" - ] + "items": "mineralogy:peridotite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json index 3705f00a0..b00f218f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite/brick" + "items": "#mineralogy:stones/peridotite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json index 63f2499a3..9e5a0d74d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_brick_stairs" - ] + "items": "mineralogy:peridotite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json index c1c5589d0..5e451123c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite/brick" + "items": "#mineralogy:stones/peridotite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json index d82f734e7..bd29c0717 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_brick_wall" - ] + "items": "mineralogy:peridotite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json index 629b293de..cfcca816a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:peridotite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite" + "items": "#mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json index 542de970c..b915b05cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + }, "rewards": { "recipes": [ "mineralogy:peridotite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/peridotite" + "items": "#mineralogy:slabs/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json index 136a10c8a..d6fe2edba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth_brick_slab" - ] + "items": "mineralogy:peridotite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json index 47badd5f1..5388cfa04 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth_slab" - ] + "items": "mineralogy:peridotite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json index ecc149341..03392a527 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth_slab" - ] + "items": "mineralogy:peridotite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json index 178a82ce2..4934f74c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth_stairs" - ] + "items": "mineralogy:peridotite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json index 07b21e578..74143a6be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth_wall" - ] + "items": "mineralogy:peridotite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json index 95bf44407..e64351a3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_slab" - ] + "items": "mineralogy:peridotite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json index 7c31e14e8..7622e742c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_slab" - ] + "items": "mineralogy:peridotite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json index be797837e..df91b1cfd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_slab" - ] + "items": "mineralogy:peridotite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json index 458781e53..cd4966722 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_stairs" - ] + "items": "mineralogy:peridotite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json index eb58f9a01..a2f77e7ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_stairs" - ] + "items": "mineralogy:peridotite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json index ef30801d4..f1f6fa495 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_wall" - ] + "items": "mineralogy:peridotite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json index 639503705..911ccead1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:peridotite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_wall" - ] + "items": "mineralogy:peridotite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json index d597fee76..8d54ad42d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json index 16527072d..6a17bc74e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth" - ] + "items": "mineralogy:peridotite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json index df0eab259..48959b0a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json index f8d41ad8e..e9c938906 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json index 662eb5c0a..ca275008e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json index 5ed132105..b608f20c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json index 6b8856f7c..186d8e04a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json index 77bef5797..00c58a8e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json index 52eda7a09..3e3e281e4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json index cc505b5e2..b18c3d98b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json index a794a1ab1..1a3428d64 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_left" - ] + "items": "mineralogy:peridotite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json index e71b4acfc..3b4c2f9ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json index 8498c7585..ef1ce04c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:peridotite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_relief_blank" - ] + "items": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json index 6e3142c2f..37d4ca9c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, "rewards": { "recipes": [ "mineralogy:peridotite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite" - ] + "items": "mineralogy:peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json index 728c3c058..58f716987 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite" + "items": "#mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json index 80da1c7ef..43dc6458b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite/smooth" + "items": "#mineralogy:stones/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json index fd9a2cd7e..5fa25fd36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/peridotite/smooth_brick" + "items": "#mineralogy:slabs/peridotite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json index 38e828e6c..0424a1452 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth_brick" - ] + "items": "mineralogy:peridotite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json index 702decef3..3d55ef0f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite/smooth_brick" + "items": "#mineralogy:stones/peridotite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json index 8b3aabc58..1792f78f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite/smooth_brick" + "items": "#mineralogy:stones/peridotite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json index f76a4f251..779398095 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/peridotite/smooth" + "items": "#mineralogy:slabs/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json index 83f899cc3..581c6175a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite_smooth" - ] + "items": "mineralogy:peridotite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json index a6f559a48..bbdd6a7f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite/smooth" + "items": "#mineralogy:stones/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json index 605d75104..646900da1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:peridotite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite/smooth" + "items": "#mineralogy:stones/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json index e6972330b..ca7f16059 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, "rewards": { "recipes": [ "mineralogy:peridotite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite" + "items": "#mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json index 316e441a2..ecf314e36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite" - ] + "items": "mineralogy:peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json index 73c5c8720..2a95c1f80 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, "rewards": { "recipes": [ "mineralogy:peridotite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/peridotite" + "items": "#mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json index 5aa6414fa..328ef45bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_block" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phosphorous_block" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phosphorous_dust" - ] + "items": "mineralogy:phosphorous_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json index 73a9d85fd..da7fc7109 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_dust" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phosphorous_dust" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phosphorous_block" - ] + "items": "mineralogy:phosphorous_block" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json index 0ca369a93..9cb0a67c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite" + "items": "#mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json index ba4e8a933..b7d8d3e26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_brick" - ] + "items": "mineralogy:phyllite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json index d8fae62e9..fec92f3f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/phyllite/brick" + "items": "#mineralogy:slabs/phyllite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json index 70e95e601..4a69afb0c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_brick" - ] + "items": "mineralogy:phyllite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json index 84654f499..617c9948c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_brick_slab" - ] + "items": "mineralogy:phyllite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json index 461422f54..20019150a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_brick_slab" - ] + "items": "mineralogy:phyllite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json index 4f2b4ee63..054b6cd3b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite/brick" + "items": "#mineralogy:stones/phyllite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json index 8c1fb9e2c..3922b7b53 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_brick_stairs" - ] + "items": "mineralogy:phyllite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json index 33e4c0ada..c5d60f5f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite/brick" + "items": "#mineralogy:stones/phyllite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json index bb36baa5c..2e991bf4b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_brick_wall" - ] + "items": "mineralogy:phyllite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json index 248ecb15b..7d93477d9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:phyllite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite" + "items": "#mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json index 354b1de23..fceec116a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + }, "rewards": { "recipes": [ "mineralogy:phyllite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/phyllite" + "items": "#mineralogy:slabs/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json index 43a3a0721..39d5e1ac3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth_brick_slab" - ] + "items": "mineralogy:phyllite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json index 8aee7ef9d..4a09b7572 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth_slab" - ] + "items": "mineralogy:phyllite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json index d1054cf1a..39daaf540 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth_slab" - ] + "items": "mineralogy:phyllite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json index e6048747b..59e238414 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth_stairs" - ] + "items": "mineralogy:phyllite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json index 6d7458a9f..3eab6c58d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth_wall" - ] + "items": "mineralogy:phyllite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json index 5d5b094b4..6d0548d7f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_slab" - ] + "items": "mineralogy:phyllite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json index e5a7159e7..e2d4e1b5a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_slab" - ] + "items": "mineralogy:phyllite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json index cd278d93e..7816c0e59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_slab" - ] + "items": "mineralogy:phyllite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json index 7dbe3fb17..feb3d4b79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_stairs" - ] + "items": "mineralogy:phyllite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json index 4f7fb8415..31e6c7046 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_stairs" - ] + "items": "mineralogy:phyllite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json index abc28f8ad..05a735fc6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_wall" - ] + "items": "mineralogy:phyllite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json index 12f2d2010..06e9819e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:phyllite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_wall" - ] + "items": "mineralogy:phyllite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json index 1f521e02e..b20fd9303 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json index 4377318e9..a35d48a69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth" - ] + "items": "mineralogy:phyllite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json index bf2bddf22..f1cd5a931 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json index ae34c655c..da2d5f7c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json index 03653a4ac..394cf6291 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json index 4d2538d01..6e55c5ec5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json index baf56f1a1..ccdef5d8c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json index 1d0103494..deb296398 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json index f8e63f155..cc68e96df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json index 63ed91572..d8e2bb9a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json index 791a4e1da..d9ea333c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_left" - ] + "items": "mineralogy:phyllite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json index 1d74fa749..550624795 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json index 2c245fca3..5ddbb9400 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:phyllite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_relief_blank" - ] + "items": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json index 07096050a..06affb846 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, "rewards": { "recipes": [ "mineralogy:phyllite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite" - ] + "items": "mineralogy:phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json index 470764141..1ceec17cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite" + "items": "#mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json index ed757a598..7b9d49bc2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite/smooth" + "items": "#mineralogy:stones/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json index 0818a031d..a915089f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/phyllite/smooth_brick" + "items": "#mineralogy:slabs/phyllite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json index 4952beda4..2cd06b39e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth_brick" - ] + "items": "mineralogy:phyllite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json index e67f2670d..96e30af80 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite/smooth_brick" + "items": "#mineralogy:stones/phyllite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json index 90171b5e6..0d2d8b93f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite/smooth_brick" + "items": "#mineralogy:stones/phyllite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json index 3ca6f8af7..d3d9b1501 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/phyllite/smooth" + "items": "#mineralogy:slabs/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json index 4beaa9516..3d9ff377e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite_smooth" - ] + "items": "mineralogy:phyllite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json index c0eb7c5d3..7ac5e1e38 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite/smooth" + "items": "#mineralogy:stones/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json index 520a291ad..eb7603968 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:phyllite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite/smooth" + "items": "#mineralogy:stones/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json index 35789f906..d696bd6c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, "rewards": { "recipes": [ "mineralogy:phyllite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite" + "items": "#mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json index 201bd1f7c..88af41c0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite" - ] + "items": "mineralogy:phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json index 3befe9973..6bd844a22 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, "rewards": { "recipes": [ "mineralogy:phyllite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/phyllite" + "items": "#mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json index 35ed3f37a..44c2441b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite" + "items": "#mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json index 551a2d0f8..47ff483b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_brick" - ] + "items": "mineralogy:quartzite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json index d113cb78d..eca2c1957 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/quartzite/brick" + "items": "#mineralogy:slabs/quartzite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json index fef100045..86a66798d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_brick" - ] + "items": "mineralogy:quartzite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json index eb9d021db..987c8d941 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_brick_slab" - ] + "items": "mineralogy:quartzite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json index 3e257abda..120f04cd9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_brick_slab" - ] + "items": "mineralogy:quartzite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json index 464bf4ec2..5eedcaa90 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite/brick" + "items": "#mineralogy:stones/quartzite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json index 96194059b..2b34914d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_brick_stairs" - ] + "items": "mineralogy:quartzite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json index bac7a1184..59fb4a057 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite/brick" + "items": "#mineralogy:stones/quartzite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json index 1c9e48cde..e1ed9bd05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_brick_wall" - ] + "items": "mineralogy:quartzite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json index fcf234ebc..723ebb278 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:quartzite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite" + "items": "#mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json index 8155937d2..fa18f1699 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + }, "rewards": { "recipes": [ "mineralogy:quartzite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/quartzite" + "items": "#mineralogy:slabs/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json index 5f954e42d..adc1625ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth_brick_slab" - ] + "items": "mineralogy:quartzite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json index 98cad5784..5698cc370 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth_slab" - ] + "items": "mineralogy:quartzite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json index 88c851257..13d8181e4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth_slab" - ] + "items": "mineralogy:quartzite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json index 2435ee61a..99ef60165 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth_stairs" - ] + "items": "mineralogy:quartzite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json index 9f9fd1abc..d91c55fe8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth_wall" - ] + "items": "mineralogy:quartzite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json index b5e8ce7e6..bb68c0505 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_slab" - ] + "items": "mineralogy:quartzite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json index 345be11fd..c742a4f05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_slab" - ] + "items": "mineralogy:quartzite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json index b518e4591..0802de384 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_slab" - ] + "items": "mineralogy:quartzite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json index 2a2cbd459..d58b1830a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_stairs" - ] + "items": "mineralogy:quartzite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json index 196934536..e8f9ea6ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_stairs" - ] + "items": "mineralogy:quartzite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json index 2599a0e54..cbcdd9d9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_wall" - ] + "items": "mineralogy:quartzite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json index 138bb7170..b4401e37f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:quartzite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_wall" - ] + "items": "mineralogy:quartzite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json index 02e4a38ca..ebb03af9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json index 543850f51..5952d24db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth" - ] + "items": "mineralogy:quartzite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json index fa773d5c8..6c99872a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json index 12862a914..aabd25cbc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json index 70cbeb3c3..34e229174 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json index 107c1720b..19ac66fef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json index 393960ebb..ab0db6e01 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json index 2febd7ee5..6984b01f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json index 61779365d..b71b7b537 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json index 5857172b3..1066bc5a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json index 7837f8383..2ffa11e9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_left" - ] + "items": "mineralogy:quartzite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json index 2e8522547..377d54854 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json index 6405e4899..9c7c5b2d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:quartzite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_relief_blank" - ] + "items": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json index 00f47a6ee..5323fb00f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, "rewards": { "recipes": [ "mineralogy:quartzite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite" - ] + "items": "mineralogy:quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json index 282ce16fa..d4030caa6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite" + "items": "#mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json index 3a040118a..6fa7e0709 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite/smooth" + "items": "#mineralogy:stones/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json index ca0cfd54b..37f9bd4f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/quartzite/smooth_brick" + "items": "#mineralogy:slabs/quartzite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json index c1f831a4c..63c0ebdf3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth_brick" - ] + "items": "mineralogy:quartzite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json index 27aba667a..0253ac319 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite/smooth_brick" + "items": "#mineralogy:stones/quartzite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json index cad1349fb..eb604823d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite/smooth_brick" + "items": "#mineralogy:stones/quartzite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json index 8a4ce546b..4db2b3896 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/quartzite/smooth" + "items": "#mineralogy:slabs/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json index 86e7855e2..aed4be0ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite_smooth" - ] + "items": "mineralogy:quartzite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json index 901049ca3..9eda810b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite/smooth" + "items": "#mineralogy:stones/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json index 9cc5d02fb..84506dd60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:quartzite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite/smooth" + "items": "#mineralogy:stones/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json index f36c96002..085636eeb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, "rewards": { "recipes": [ "mineralogy:quartzite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite" + "items": "#mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json index 4efd03574..42fe14bd6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite" - ] + "items": "mineralogy:quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json index e70141e19..297176d93 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, "rewards": { "recipes": [ "mineralogy:quartzite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/quartzite" + "items": "#mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json index 5f2ec3f5f..0374278d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite" + "items": "#mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json index 4366c0a78..d32dc8f5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_brick" - ] + "items": "mineralogy:rhyolite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json index afdca6001..2c15370b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rhyolite/brick" + "items": "#mineralogy:slabs/rhyolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json index e0aac8e0d..36cc2dc73 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_brick" - ] + "items": "mineralogy:rhyolite_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json index 263e89530..6654a6806 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_brick_slab" - ] + "items": "mineralogy:rhyolite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json index 629d437d8..4ad2d0c79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_brick_slab" - ] + "items": "mineralogy:rhyolite_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json index abd43f492..f64a93073 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite/brick" + "items": "#mineralogy:stones/rhyolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json index 985006dcf..2b7dfd49c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_brick_stairs" - ] + "items": "mineralogy:rhyolite_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json index 6ca82f8bf..530c28cc2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite/brick" + "items": "#mineralogy:stones/rhyolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json index f28b9cd85..afb2e51d6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_brick_wall" - ] + "items": "mineralogy:rhyolite_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json index 38a897f13..2a73b46c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:rhyolite_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite" + "items": "#mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json index 8d356bcf1..8000fa702 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rhyolite" + "items": "#mineralogy:slabs/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json index 5e56eb423..d9cd09e13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth_brick_slab" - ] + "items": "mineralogy:rhyolite_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json index 8035d7b8c..383cd1cbf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth_slab" - ] + "items": "mineralogy:rhyolite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json index c392288fe..e3f3ac7e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth_slab" - ] + "items": "mineralogy:rhyolite_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json index f7078240b..503f22065 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth_stairs" - ] + "items": "mineralogy:rhyolite_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json index 86b9189f0..7a848b79f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth_wall" - ] + "items": "mineralogy:rhyolite_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json index 6d1f20a27..53711d8a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_slab" - ] + "items": "mineralogy:rhyolite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json index 9cf948a5e..d8de9bd25 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_slab" - ] + "items": "mineralogy:rhyolite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json index 36b7b0681..754832183 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_slab" - ] + "items": "mineralogy:rhyolite_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json index 6c33c5978..cadfa27c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_stairs" - ] + "items": "mineralogy:rhyolite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json index a279e31fe..95daf242d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_stairs" - ] + "items": "mineralogy:rhyolite_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json index 4247e93e0..66268a71b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_wall" - ] + "items": "mineralogy:rhyolite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json index a1ccb5932..0ebac7443 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rhyolite_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_wall" - ] + "items": "mineralogy:rhyolite_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json index 772e19d74..5b981b641 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json index 08d211df6..4d39d4d17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth" - ] + "items": "mineralogy:rhyolite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json index 5a8fd76e2..922816b02 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json index 688b3c0e0..395f8af2a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json index 7445c82ec..b2d87991d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json index 1b038fe9f..70bd3af38 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json index 199a4ef56..6db93c5b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json index 844d3da46..07f0703d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json index adc38fb27..4e05446b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json index c2837f4b4..492b65085 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json index 435ce8a58..ecbfbb7d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_left" - ] + "items": "mineralogy:rhyolite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json index 1fd0d7595..e7407a6cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json index db0914471..5c768d1bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_relief_blank" - ] + "items": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json index 8bfb4f452..0750387f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite" - ] + "items": "mineralogy:rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json index 6617bd4d6..7f696508e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite" + "items": "#mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json index 34b3f9383..7a91edb5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite/smooth" + "items": "#mineralogy:stones/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json index da94b2977..ce4364d1c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rhyolite/smooth_brick" + "items": "#mineralogy:slabs/rhyolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json index 6ab415431..caf752d82 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth_brick" - ] + "items": "mineralogy:rhyolite_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json index d410283a6..9cf29d79b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite/smooth_brick" + "items": "#mineralogy:stones/rhyolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json index 4ff387e0f..76243c925 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite/smooth_brick" + "items": "#mineralogy:stones/rhyolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json index 4cadb0f38..a5a5d3dcb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rhyolite/smooth" + "items": "#mineralogy:slabs/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json index 2d1f6d44a..ec966cd4f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite_smooth" - ] + "items": "mineralogy:rhyolite_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json index e844b0922..069e6de75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite/smooth" + "items": "#mineralogy:stones/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json index 91e8c330c..ea8da747f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite/smooth" + "items": "#mineralogy:stones/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json index 82039687f..c5a00e16b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite" + "items": "#mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json index e226203b8..be0fa8c26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite" - ] + "items": "mineralogy:rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json index 499449215..6784bb051 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, "rewards": { "recipes": [ "mineralogy:rhyolite_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rhyolite" + "items": "#mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json index c5d0358e8..73caa7d47 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + }, "rewards": { "recipes": [ "mineralogy:rock_salt" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_dust" - ] + "items": "mineralogy:rock_salt_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json index 26e7e4697..1da89fcca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt" + "items": "#mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json index d59a51816..72dbcd6ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_brick" - ] + "items": "mineralogy:rock_salt_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json index 799226042..424542079 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rock_salt/brick" + "items": "#mineralogy:slabs/rock_salt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json index f50dde31d..e691024af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_brick" - ] + "items": "mineralogy:rock_salt_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json index 738a70f89..ab0adfc0c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_brick_slab" - ] + "items": "mineralogy:rock_salt_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json index d50ba92e8..1828e868e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_brick_slab" - ] + "items": "mineralogy:rock_salt_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json index 76ca2bc06..cdf74108d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt/brick" + "items": "#mineralogy:stones/rock_salt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json index c1e81b470..eed654131 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_brick_stairs" - ] + "items": "mineralogy:rock_salt_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json index 998f0d445..1ff7a6cd1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt/brick" + "items": "#mineralogy:stones/rock_salt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json index 230c3e792..dfe1c5bf0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_brick_wall" - ] + "items": "mineralogy:rock_salt_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json index 1b2fcb879..78f7bce56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:rock_salt_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt" + "items": "#mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json index e4d406ca6..f85066d15 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_dust" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_dust" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "items": "mineralogy:rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json index 526b2353c..57b69efd0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rock_salt" + "items": "#mineralogy:slabs/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json index 0906659d7..acbe72882 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth_brick_slab" - ] + "items": "mineralogy:rock_salt_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json index 53df1992d..d1308872b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth_slab" - ] + "items": "mineralogy:rock_salt_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json index d1a43c85f..c8163b54f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth_slab" - ] + "items": "mineralogy:rock_salt_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json index d0ad08962..e88140965 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth_stairs" - ] + "items": "mineralogy:rock_salt_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json index 39ed1156d..29e7d8dec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth_wall" - ] + "items": "mineralogy:rock_salt_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json index e73cbdf4d..de5867606 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_slab" - ] + "items": "mineralogy:rock_salt_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json index 048b0ce94..8ee3aff52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_slab" - ] + "items": "mineralogy:rock_salt_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json index 415169f03..cbe64675f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_slab" - ] + "items": "mineralogy:rock_salt_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json index c212fde5b..085b95afa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_stairs" - ] + "items": "mineralogy:rock_salt_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json index f1a650c0c..9b259da27 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_stairs" - ] + "items": "mineralogy:rock_salt_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json index 62abf70b0..1b7901e2a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_wall" - ] + "items": "mineralogy:rock_salt_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json index ab14cb426..475ee839a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rock_salt_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_wall" - ] + "items": "mineralogy:rock_salt_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json index bee06bdfe..850fa81a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json index a5132211f..8982df4ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth" - ] + "items": "mineralogy:rock_salt_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json index 008c47834..ab40e5325 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json index 2c62252d6..9b0c8552c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json index 540f7d8af..9b4f0f5ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json index e4efa9f49..6237181d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json index abe624ddd..207833c6f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json index 5c3925628..83f566fc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json index 18fd06353..266521e9d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json index ef79b1e98..23307dfa1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json index dbc733248..ce128ce7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_left" - ] + "items": "mineralogy:rock_salt_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json index 58bc4330d..201aa5084 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json index 0a8bb588a..50524ffdb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_relief_blank" - ] + "items": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json index f66b8262a..29240270d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "items": "mineralogy:rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json index ec5b20300..d21dd30ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt" + "items": "#mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json index 67ee534ed..67ec56cc6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt/smooth" + "items": "#mineralogy:stones/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json index 952a1a3e6..97b843a21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rock_salt/smooth_brick" + "items": "#mineralogy:slabs/rock_salt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json index 4adc6c9c1..b7227ace4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth_brick" - ] + "items": "mineralogy:rock_salt_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json index b13c3e110..40eed8eff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt/smooth_brick" + "items": "#mineralogy:stones/rock_salt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json index 3d9ca0588..5c8f0e693 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt/smooth_brick" + "items": "#mineralogy:stones/rock_salt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json index 9a11edb5d..b7130e483 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/rock_salt/smooth" + "items": "#mineralogy:slabs/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json index 2fdb4f989..57e1f206f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt_smooth" - ] + "items": "mineralogy:rock_salt_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json index 6da9fbd60..784210804 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt/smooth" + "items": "#mineralogy:stones/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json index 6339e7e54..8cb434246 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt/smooth" + "items": "#mineralogy:stones/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json index e53c44374..1a6e7495c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt" + "items": "#mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json index 6298ec26e..8bfac0b7f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "items": "mineralogy:rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json index bea0d2e06..e2ddc5231 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, "rewards": { "recipes": [ "mineralogy:rock_salt_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/rock_salt" + "items": "#mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json index 78ab89add..7a12ad1d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltlamp" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rocksaltlamp" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "items": "mineralogy:rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json index 93b51b121..342482753 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltstreetlamp" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ] + }, "rewards": { "recipes": [ "mineralogy:rocksaltstreetlamp" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rocksaltlamp" - ] + "items": "mineralogy:rocksaltlamp" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json index 9cc5c4324..70b8831c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, "rewards": { "recipes": [ "mineralogy:schist_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist" + "items": "#mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json index 67191ea7e..ae0790764 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_brick" - ] + "items": "mineralogy:schist_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json index 457784503..2f88b0924 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:schist_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/schist/brick" + "items": "#mineralogy:slabs/schist/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json index ff02ed15f..d3bbef2e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:schist_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_brick" - ] + "items": "mineralogy:schist_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json index 9958f95eb..9dfeaed7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_brick_slab" - ] + "items": "mineralogy:schist_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json index 0d160aa88..3cff51d38 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_brick_slab" - ] + "items": "mineralogy:schist_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json index 52167027f..5c8713531 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:schist_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist/brick" + "items": "#mineralogy:stones/schist/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json index 8b5e35c56..40aa48698 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_brick_stairs" - ] + "items": "mineralogy:schist_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json index b656a0754..2830da83a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:schist_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist/brick" + "items": "#mineralogy:stones/schist/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json index ed807dd5b..27ae66f9a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_brick_wall" - ] + "items": "mineralogy:schist_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json index 01aff1f49..aac8f3197 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:schist_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist" + "items": "#mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json index 2c13a5b99..5e709a263 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + }, "rewards": { "recipes": [ "mineralogy:schist_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/schist" + "items": "#mineralogy:slabs/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json index 213e2e10f..0bdf3f2d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth_brick_slab" - ] + "items": "mineralogy:schist_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json index 2eaba0ca9..b766395c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth_slab" - ] + "items": "mineralogy:schist_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json index 5798468ce..48a19c867 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth_slab" - ] + "items": "mineralogy:schist_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json index 23bbd8018..c831c5544 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth_stairs" - ] + "items": "mineralogy:schist_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json index 4addd3dd0..1f23ce2c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth_wall" - ] + "items": "mineralogy:schist_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json index d50d11bc8..8d5722511 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_slab" - ] + "items": "mineralogy:schist_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json index 1afed22b5..e5b01a7ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_slab" - ] + "items": "mineralogy:schist_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json index 14b593ccb..07406ce37 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_slab" - ] + "items": "mineralogy:schist_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json index 72b1f6a58..de3d1efd5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_stairs" - ] + "items": "mineralogy:schist_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json index d024b1bc8..d28fceb36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_stairs" - ] + "items": "mineralogy:schist_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json index c8926e5a4..0b4baf427 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_wall" - ] + "items": "mineralogy:schist_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json index d4638766a..e0125134d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:schist_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_wall" - ] + "items": "mineralogy:schist_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json index 3dc0ea60f..9a7111d7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json index 2f8969da9..72427887c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth" - ] + "items": "mineralogy:schist_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json index 32a3a8361..bd28f65dd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json index 3f103a2cb..fa29c7b71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json index e877d6175..3e2d260e5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json index c048644a4..a416715bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json index 2bc2cd9a1..d6717ea2a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json index ca11e5f08..8d2b6d735 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json index f4de4cd0e..945425726 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json index 7edfd6e17..6846cf7c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json index e0c41d5e6..ac2cdc288 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_left" - ] + "items": "mineralogy:schist_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json index a5eab5605..3ed7028b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json index 66ffb1160..140c0a4de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:schist_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_relief_blank" - ] + "items": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json index b87154765..4875dea5f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, "rewards": { "recipes": [ "mineralogy:schist_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist" - ] + "items": "mineralogy:schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json index 893f6d271..776464752 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist" + "items": "#mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json index c38bc13d4..3ae02565c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist/smooth" + "items": "#mineralogy:stones/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json index 48f155684..81cdeea00 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/schist/smooth_brick" + "items": "#mineralogy:slabs/schist/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json index 02d8e492e..7ce462412 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth_brick" - ] + "items": "mineralogy:schist_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json index daf46bfc9..b662765a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist/smooth_brick" + "items": "#mineralogy:stones/schist/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json index 54cbe208e..32aa4b758 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist/smooth_brick" + "items": "#mineralogy:stones/schist/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json index 0e1bcfd76..0f3a9c097 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/schist/smooth" + "items": "#mineralogy:slabs/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json index 3a72b053a..637e630d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist_smooth" - ] + "items": "mineralogy:schist_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json index 23af68382..76b5f7e15 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist/smooth" + "items": "#mineralogy:stones/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json index 8cf333d28..adc5faa27 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:schist_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist/smooth" + "items": "#mineralogy:stones/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json index f28d0681a..df941ee92 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, "rewards": { "recipes": [ "mineralogy:schist_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist" + "items": "#mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json index 3849e3de3..b08debb75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist" - ] + "items": "mineralogy:schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json index 306630b53..7ad0bc047 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, "rewards": { "recipes": [ "mineralogy:schist_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/schist" + "items": "#mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json index 07413296e..00601452c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, "rewards": { "recipes": [ "mineralogy:scoria_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria" + "items": "#mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json index 655da08c2..67f2c15ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_brick" - ] + "items": "mineralogy:scoria_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json index 0d205f8eb..1f2db34a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/scoria/brick" + "items": "#mineralogy:slabs/scoria/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json index fa44175f6..97cf2d23b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_brick" - ] + "items": "mineralogy:scoria_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json index d6ad145c3..b91990e2e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_brick_slab" - ] + "items": "mineralogy:scoria_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json index f18acfc72..aac2ef901 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_brick_slab" - ] + "items": "mineralogy:scoria_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json index 84f569dbd..f3e640aa2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria/brick" + "items": "#mineralogy:stones/scoria/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json index 70b347b24..c9a411523 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_brick_stairs" - ] + "items": "mineralogy:scoria_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json index 24ab047f3..ed29b6e31 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria/brick" + "items": "#mineralogy:stones/scoria/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json index a79fecdb7..2f01c0392 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_brick_wall" - ] + "items": "mineralogy:scoria_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json index 3c94abbe1..b851d1082 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:scoria_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria" + "items": "#mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json index 24780f8d8..4b702780f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + }, "rewards": { "recipes": [ "mineralogy:scoria_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/scoria" + "items": "#mineralogy:slabs/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json index 8d498372d..0a17bb381 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth_brick_slab" - ] + "items": "mineralogy:scoria_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json index 96f338ae5..c2fc0483a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth_slab" - ] + "items": "mineralogy:scoria_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json index 941d03aa8..508cb8310 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth_slab" - ] + "items": "mineralogy:scoria_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json index e7d1a43ab..289da5d7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth_stairs" - ] + "items": "mineralogy:scoria_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json index 1de0cddfd..233341daa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth_wall" - ] + "items": "mineralogy:scoria_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json index c1589500e..8c74777aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_slab" - ] + "items": "mineralogy:scoria_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json index dc3c76728..d900c2156 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_slab" - ] + "items": "mineralogy:scoria_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json index 7ba3301c0..b6e7e37d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_slab" - ] + "items": "mineralogy:scoria_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json index bfee4961b..874f26f32 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_stairs" - ] + "items": "mineralogy:scoria_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json index 77ef197c4..ee99a545e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_stairs" - ] + "items": "mineralogy:scoria_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json index a4f13bb68..5bf34a617 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_wall" - ] + "items": "mineralogy:scoria_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json index 38453b77a..0889c916a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:scoria_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_wall" - ] + "items": "mineralogy:scoria_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json index d0f74e63b..920c7068e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json index f2d9123ee..dccbc448c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth" - ] + "items": "mineralogy:scoria_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json index 65149d676..dd484ca81 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json index e18a3dfbe..048510490 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json index c619b849b..8bfaa25fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json index b01bb817d..84653c4a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json index 1447124b9..3ccf919ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json index c1456a7ad..2833c2fd3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json index aed690f98..e8e469ed5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json index 23f1c58f0..f1871926d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json index 7e8b77816..1269ab095 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_left" - ] + "items": "mineralogy:scoria_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json index f2878bd93..dd84e0d7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json index 58fa15e1d..803d6e3d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:scoria_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_relief_blank" - ] + "items": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json index bb1fbbf7d..378d2c960 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, "rewards": { "recipes": [ "mineralogy:scoria_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria" - ] + "items": "mineralogy:scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json index 4f2151716..5c70fe6be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria" + "items": "#mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json index df852b5dc..bf774c0c7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria/smooth" + "items": "#mineralogy:stones/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json index 07fc9f8d8..1c74eab7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/scoria/smooth_brick" + "items": "#mineralogy:slabs/scoria/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json index 169eadcd0..b6ddf3e9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth_brick" - ] + "items": "mineralogy:scoria_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json index 719e64501..141e27908 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria/smooth_brick" + "items": "#mineralogy:stones/scoria/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json index 145933e82..4f761d401 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria/smooth_brick" + "items": "#mineralogy:stones/scoria/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json index 31f8f4c2e..6c603809e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/scoria/smooth" + "items": "#mineralogy:slabs/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json index 06a3ae05e..c6aa01a17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria_smooth" - ] + "items": "mineralogy:scoria_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json index bf966f3af..25e11dc16 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria/smooth" + "items": "#mineralogy:stones/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json index 07c8e51dd..2762d9743 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:scoria_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria/smooth" + "items": "#mineralogy:stones/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json index 1ababad97..fa3244a68 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, "rewards": { "recipes": [ "mineralogy:scoria_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria" + "items": "#mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json index c7aa63efc..92efbf6e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria" - ] + "items": "mineralogy:scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json index af4a05565..42e8e1b74 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, "rewards": { "recipes": [ "mineralogy:scoria_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/scoria" + "items": "#mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json index 65b135c22..4ede24973 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, "rewards": { "recipes": [ "mineralogy:shale_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale" + "items": "#mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json index 85365fcbd..2cbdd7d77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_brick" - ] + "items": "mineralogy:shale_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json index 294dc6996..905a35cfd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:shale_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/shale/brick" + "items": "#mineralogy:slabs/shale/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json index 88e613055..178166300 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:shale_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_brick" - ] + "items": "mineralogy:shale_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json index d72bd7223..29a55cd84 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_brick_slab" - ] + "items": "mineralogy:shale_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json index d1bb9d9dd..d8a6c5031 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_brick_slab" - ] + "items": "mineralogy:shale_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json index 2d1bdd650..8a0a25e29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:shale_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale/brick" + "items": "#mineralogy:stones/shale/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json index a42a489c4..5a2bd3f7f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_brick_stairs" - ] + "items": "mineralogy:shale_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json index ddb36a55e..a07f69bc5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:shale_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale/brick" + "items": "#mineralogy:stones/shale/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json index 6bfe72186..6058474a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_brick_wall" - ] + "items": "mineralogy:shale_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json index 3b41dfeb8..fecf06016 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:shale_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale" + "items": "#mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json index ccbed4db8..dd41ed45a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + }, "rewards": { "recipes": [ "mineralogy:shale_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/shale" + "items": "#mineralogy:slabs/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json index 68bf50f6e..d058519b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth_brick_slab" - ] + "items": "mineralogy:shale_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json index b3fc2375d..4290ed0c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth_slab" - ] + "items": "mineralogy:shale_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json index a02ae1221..2f39d9d09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth_slab" - ] + "items": "mineralogy:shale_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json index a5af4f191..1c0f2644a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth_stairs" - ] + "items": "mineralogy:shale_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json index 595c4761c..9d26781c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth_wall" - ] + "items": "mineralogy:shale_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json index 4d75dd56c..6e27e37fc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_slab" - ] + "items": "mineralogy:shale_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json index 44ea59a26..45b2e06c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_slab" - ] + "items": "mineralogy:shale_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json index ab6e5bb3c..c6b11e986 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_slab" - ] + "items": "mineralogy:shale_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json index d6a9c7b18..815928007 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_stairs" - ] + "items": "mineralogy:shale_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json index 79f410850..cb90fcfd8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_stairs" - ] + "items": "mineralogy:shale_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json index d512fb9d2..1b91be475 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_wall" - ] + "items": "mineralogy:shale_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json index 3563d72c6..64cf5e7b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:shale_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_wall" - ] + "items": "mineralogy:shale_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json index cad9fcc45..c9dfac0e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json index 0777883db..4e16c63c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth" - ] + "items": "mineralogy:shale_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json index 52fa1531b..974f94f5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json index 8aeaaa179..9cfd3321f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json index 37c1c38dd..4daba1b9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json index 42f89fdc5..6bc11a1a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json index 5bf34b3a3..5e621a527 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json index eba95507a..69151311b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json index d1d6e8dc4..8ad3a4bd3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json index 024cc50ca..6fc25738e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json index 2f87d3594..d1f7d81d6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_left" - ] + "items": "mineralogy:shale_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json index 5c9eaca83..a40d2078a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json index 76885bb9d..c04e20697 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:shale_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_relief_blank" - ] + "items": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json index 26ebcad0d..a2b5269a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, "rewards": { "recipes": [ "mineralogy:shale_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale" - ] + "items": "mineralogy:shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json index 76cdb556d..39d540d60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale" + "items": "#mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json index 696b1070c..bc88942dc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale/smooth" + "items": "#mineralogy:stones/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json index c44c9b727..3e573f870 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/shale/smooth_brick" + "items": "#mineralogy:slabs/shale/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json index 357527dbf..7e8b841fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth_brick" - ] + "items": "mineralogy:shale_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json index 8a780b14a..2b65a4723 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale/smooth_brick" + "items": "#mineralogy:stones/shale/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json index 33b688ea9..3f97b66ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale/smooth_brick" + "items": "#mineralogy:stones/shale/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json index 7a9ff4bc5..3c9f3f707 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/shale/smooth" + "items": "#mineralogy:slabs/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json index d60e252e4..dfbba3527 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale_smooth" - ] + "items": "mineralogy:shale_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json index 06a8d7dcd..433a72cca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale/smooth" + "items": "#mineralogy:stones/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json index e41c1728c..12eeaefc3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:shale_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale/smooth" + "items": "#mineralogy:stones/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json index 9d479325c..9e1b60c13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, "rewards": { "recipes": [ "mineralogy:shale_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale" + "items": "#mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json index d37971374..b7b96d3b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale" - ] + "items": "mineralogy:shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json index 248241ec6..5d34a3c70 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, "rewards": { "recipes": [ "mineralogy:shale_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/shale" + "items": "#mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json index c975f0544..d0768fd73 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone" + "items": "#mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json index 221bf68f7..2b46353a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_brick" - ] + "items": "mineralogy:siltstone_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json index 6c035bfb5..c6715469b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/siltstone/brick" + "items": "#mineralogy:slabs/siltstone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json index 0961bbe6e..4e26c315f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_brick" - ] + "items": "mineralogy:siltstone_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json index 2dfe17b55..cd0858aad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_brick_slab" - ] + "items": "mineralogy:siltstone_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json index 6344f0201..20638fd36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_brick_slab" - ] + "items": "mineralogy:siltstone_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json index c564d3918..f50de4dbb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone/brick" + "items": "#mineralogy:stones/siltstone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json index a4f9ca769..d85f4973a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_brick_stairs" - ] + "items": "mineralogy:siltstone_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json index c7e5b8e1f..23ea03c9a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone/brick" + "items": "#mineralogy:stones/siltstone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json index fb60a3cad..6b2e09bfc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_brick_wall" - ] + "items": "mineralogy:siltstone_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json index 135acffa8..362d10f41 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:siltstone_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone" + "items": "#mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json index 42bb6c336..ebc24e3a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + }, "rewards": { "recipes": [ "mineralogy:siltstone_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/siltstone" + "items": "#mineralogy:slabs/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json index 2bbf03245..f405e0ee5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth_brick_slab" - ] + "items": "mineralogy:siltstone_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json index 66f61519f..ea1d7506c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth_slab" - ] + "items": "mineralogy:siltstone_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json index 9a3ddca85..b50641c36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth_slab" - ] + "items": "mineralogy:siltstone_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json index 22eb2d24d..8947a128c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth_stairs" - ] + "items": "mineralogy:siltstone_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json index c290aa24f..037d1670e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth_wall" - ] + "items": "mineralogy:siltstone_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json index b9a24493d..feaac4d61 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_slab" - ] + "items": "mineralogy:siltstone_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json index 2cbb3773f..b5dfb907b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_slab" - ] + "items": "mineralogy:siltstone_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json index 630042399..9ac22a64b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_slab" - ] + "items": "mineralogy:siltstone_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json index 294a5aa70..cd53b6805 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_stairs" - ] + "items": "mineralogy:siltstone_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json index 27ad3ad99..a6d2ddfca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_stairs" - ] + "items": "mineralogy:siltstone_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json index c51fb4501..db6def6c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_wall" - ] + "items": "mineralogy:siltstone_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json index 0ed0ae8dc..59e8c32c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:siltstone_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_wall" - ] + "items": "mineralogy:siltstone_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json index 70da6e8af..720d16c1c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json index b8920a493..51ddd4b49 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth" - ] + "items": "mineralogy:siltstone_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json index 62ab3b351..a06af8e28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json index d69551fbc..1fcbb91aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json index a61cf8a9d..e0bebc7ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json index 8f80a3454..2f2026ace 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json index 8ec6adc82..65270aeac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json index 56ef95b2b..e86d49b60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json index 18ba43fca..79184f9e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json index 86e84dff9..5d0759727 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json index 05b14d8fb..c8a4c9caa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_left" - ] + "items": "mineralogy:siltstone_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json index 9e77f5e30..45bcd843a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json index ccb67fb9d..3c6b7a785 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:siltstone_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_relief_blank" - ] + "items": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json index 93f4eadef..eca9070d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, "rewards": { "recipes": [ "mineralogy:siltstone_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone" - ] + "items": "mineralogy:siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json index 074383ca3..77dbc18f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone" + "items": "#mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json index 43dbf48e2..83d22f176 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone/smooth" + "items": "#mineralogy:stones/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json index 2435417f7..94ecba416 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/siltstone/smooth_brick" + "items": "#mineralogy:slabs/siltstone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json index f4a72bcc8..1fc950d86 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth_brick" - ] + "items": "mineralogy:siltstone_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json index 926c4d53f..10a70f35c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone/smooth_brick" + "items": "#mineralogy:stones/siltstone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json index 90d871938..91e817d9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone/smooth_brick" + "items": "#mineralogy:stones/siltstone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json index 958dfee3a..f3133363e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/siltstone/smooth" + "items": "#mineralogy:slabs/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json index f6d3faa7a..7c4b272b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone_smooth" - ] + "items": "mineralogy:siltstone_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json index a60aa6c0d..9192fb68e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone/smooth" + "items": "#mineralogy:stones/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json index 59d93d8fe..c0d978a1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:siltstone_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone/smooth" + "items": "#mineralogy:stones/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json index 646793e5f..5acb8f8bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, "rewards": { "recipes": [ "mineralogy:siltstone_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone" + "items": "#mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json index 16773498c..c484cd2ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone" - ] + "items": "mineralogy:siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json index 12ac84ac3..9243ba5f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, "rewards": { "recipes": [ "mineralogy:siltstone_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/siltstone" + "items": "#mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json index ebfdfcf94..cc3ade08a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, "rewards": { "recipes": [ "mineralogy:slate_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate" + "items": "#mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json index 0393703ae..34fa73f2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_brick" - ] + "items": "mineralogy:slate_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json index e9cd2ae67..ed80345f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:slate_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/slate/brick" + "items": "#mineralogy:slabs/slate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json index 7604b454e..05c848808 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:slate_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_brick" - ] + "items": "mineralogy:slate_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json index 40198f253..d83a8689d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_brick_slab" - ] + "items": "mineralogy:slate_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json index 278d54383..17f70058d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_brick_slab" - ] + "items": "mineralogy:slate_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json index c845b9eee..d31bdf8b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:slate_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate/brick" + "items": "#mineralogy:stones/slate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json index caa7c3784..155e957df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_brick_stairs" - ] + "items": "mineralogy:slate_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json index adb3d6a13..5354734c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:slate_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate/brick" + "items": "#mineralogy:stones/slate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json index 4c9469bfb..6d316446a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_brick_wall" - ] + "items": "mineralogy:slate_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json index 93c9f99f3..99f52e928 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:slate_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate" + "items": "#mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json index 3f5576a08..0c16fc745 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + }, "rewards": { "recipes": [ "mineralogy:slate_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/slate" + "items": "#mineralogy:slabs/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json index a1bb7f785..b93d8c51a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth_brick_slab" - ] + "items": "mineralogy:slate_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json index 59dee9b2d..95a2fb22d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth_slab" - ] + "items": "mineralogy:slate_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json index e39d81757..4821dfb98 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth_slab" - ] + "items": "mineralogy:slate_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json index ea090b229..747c63de2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth_stairs" - ] + "items": "mineralogy:slate_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json index 44f563f19..e78158e88 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth_wall" - ] + "items": "mineralogy:slate_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json index 5e29369ca..3fad5d6e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_slab" - ] + "items": "mineralogy:slate_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json index dca00fea8..193c5e598 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_slab" - ] + "items": "mineralogy:slate_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json index b43db17d4..3dd66dfbd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_slab" - ] + "items": "mineralogy:slate_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json index ce0a8c891..2896fbfea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_stairs" - ] + "items": "mineralogy:slate_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json index 1512ff11a..be70c0bc8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_stairs" - ] + "items": "mineralogy:slate_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json index e918d7189..4a34d80c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_wall" - ] + "items": "mineralogy:slate_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json index 4d571275d..d953574a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:slate_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_wall" - ] + "items": "mineralogy:slate_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json index 94c1ba660..683e3b60f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json index 4a07ab3c8..b9f601663 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_blank" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth" - ] + "items": "mineralogy:slate_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json index 4a5e9b880..29c34a60a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json index db3765261..2d9ee8f62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json index af7b4fc3f..467ee70a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json index e775724ea..5e6169572 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json index 176202595..bd07b6a69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json index 9e8e24283..c4c51ead1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json index 81c6bd8cc..4a43515b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json index b61465303..8f05e81eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json index 275399909..6abc66785 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_left" - ] + "items": "mineralogy:slate_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json index ca7f46990..505493333 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json index 41673ae53..ec988b579 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:slate_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_relief_blank" - ] + "items": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json index 7b0140aab..2fcacea4c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, "rewards": { "recipes": [ "mineralogy:slate_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate" - ] + "items": "mineralogy:slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json index cd003d0da..2e2588e04 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate" + "items": "#mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json index 45a65e0de..5309d9ffe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate/smooth" + "items": "#mineralogy:stones/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json index e1e51043d..bf5602a50 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/slate/smooth_brick" + "items": "#mineralogy:slabs/slate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json index 7af8649b7..799c35f3e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth_brick" - ] + "items": "mineralogy:slate_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json index cb981e919..3e3ce1b17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate/smooth_brick" + "items": "#mineralogy:stones/slate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json index 00d52c98e..d8180d359 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate/smooth_brick" + "items": "#mineralogy:stones/slate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json index 412352eca..bddaee466 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/slate/smooth" + "items": "#mineralogy:slabs/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json index 9cbce4d65..a593b591d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate_smooth" - ] + "items": "mineralogy:slate_smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json index 2942f0f02..7ab9df18f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate/smooth" + "items": "#mineralogy:stones/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json index 4b97ecd31..cb01eb51b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:slate_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate/smooth" + "items": "#mineralogy:stones/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json index 1b0f154da..2bc35223f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, "rewards": { "recipes": [ "mineralogy:slate_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate" + "items": "#mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json index 2497325a2..c87b12ae8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate" - ] + "items": "mineralogy:slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json index 684d958ef..677afdbaf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, "rewards": { "recipes": [ "mineralogy:slate_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/slate" + "items": "#mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json index 708987dc2..a2d9bfb5e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_block" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ] + }, "rewards": { "recipes": [ "mineralogy:sulfur_block" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:sulfur_dust" - ] + "items": "mineralogy:sulfur_dust" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json index b8fb6db6b..56898dc8f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_dust" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ] + }, "rewards": { "recipes": [ "mineralogy:sulfur_dust" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:sulfur_block" - ] + "items": "mineralogy:sulfur_block" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json index e627e1d89..f8f811ced 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, "rewards": { "recipes": [ "mineralogy:tuff_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff" + "items": "#mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json index 80ea92834..7c9199969 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_block_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_brick" - ] + "items": "mineralogy:tuff_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json index afcc30a83..7ee0ee366 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/tuff/brick" + "items": "#mineralogy:slabs/tuff/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json index d4d3bab8e..85eaa19b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_brick" - ] + "items": "mineralogy:tuff_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json index eef3d2c42..f8b051d9a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_brick_slab" - ] + "items": "mineralogy:tuff_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json index 3e3046f0a..5dac5102c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_brick_slab" - ] + "items": "mineralogy:tuff_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json index 231fcfa09..21a31d8dd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/brick" + "items": "#mineralogy:stones/tuff/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json index f1f1fd11c..6f6316370 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_brick_stairs" - ] + "items": "mineralogy:tuff_brick_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json index bc89cbc24..8aa01031d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/brick" + "items": "#mineralogy:stones/tuff/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json index bc6247c7c..7c7d9d5e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_brick_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_brick_wall" - ] + "items": "mineralogy:tuff_brick_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json index fe6dfbac7..d7b2a7249 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "rewards": { "recipes": [ "mineralogy:tuff_cobblestone" @@ -19,7 +16,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff" + "items": "#mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json index 76d2f5e7a..3522f3afb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + }, "rewards": { "recipes": [ "mineralogy:tuff_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/tuff" + "items": "#mineralogy:slabs/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json index 1d0da4575..9e207da7e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_polished_brick_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_smooth_brick_slab" - ] + "items": "mineralogy:tuff_smooth_brick_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json index 131903b0f..825b75603 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_polished_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_smooth_slab" - ] + "items": "mineralogy:tuff_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json index 4360b6956..4d27a309f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_polished_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_smooth_slab" - ] + "items": "mineralogy:tuff_smooth_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json index 6d286ca1a..f1c60c1f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_polished_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_smooth_stairs" - ] + "items": "mineralogy:tuff_smooth_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json index 606da3379..1b32a79b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_polished_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_smooth_wall" - ] + "items": "mineralogy:tuff_smooth_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json index 5bb0e221a..39f8e3a48 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_raw_slab_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_slab" - ] + "items": "mineralogy:tuff_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json index f5b11f25b..3a521d880 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_raw_slab_recombination" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_slab" - ] + "items": "mineralogy:tuff_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json index f854e2a0c..1765fb9c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_raw_slabs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_slab" - ] + "items": "mineralogy:tuff_slab" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json index e1bec7859..20fa4f162 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_raw_stairs_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_stairs" - ] + "items": "mineralogy:tuff_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json index 55494e0a8..fd1df3fef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_raw_stairs_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_stairs" - ] + "items": "mineralogy:tuff_stairs" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json index 0377a1453..10539bfde 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_raw_wall_polishing" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_wall" - ] + "items": "mineralogy:tuff_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json index 89fec0641..4c3ccb01a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ] + }, "rewards": { "recipes": [ "mineralogy:tuff_raw_walls_to_brick" @@ -26,9 +29,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_wall" - ] + "items": "mineralogy:tuff_wall" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json index 12eb49a9c..116f7de18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_axe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json index cd7246de6..f4a27a162 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_blank" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/smooth" + "items": "#mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json index bc743d9e3..f9b0edb5a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_cross" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json index ed25bfada..0ea8769bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_hammer" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json index 501c631ea..a4902a028 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_hoe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json index affebce23..1fdf19af2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_horizontal" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json index 63a21db3b..0b92660f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_i" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json index 29b4a00d2..d973ed7d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_left" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json index 991b41b76..4f8727ce3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_pickaxe" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json index e2c3c86b7..2694f30be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_plus" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json index 00aa3c5db..c9f027d41 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_right" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_left" - ] + "items": "mineralogy:tuff_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json index 11f66d31e..877d95afb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_sword" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json index 38d5ee780..561ca6e2d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + }, "rewards": { "recipes": [ "mineralogy:tuff_relief_vertical" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_relief_blank" - ] + "items": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json index 28529f628..753efbdc3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, "rewards": { "recipes": [ "mineralogy:tuff_slab" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff" + "items": "#mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json index db1199ce3..10afbbef4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff" + "items": "#mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json index 03e5b33b3..eaa49e950 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/smooth" + "items": "#mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json index f4b3d10f1..bc6a825dd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/tuff/smooth_brick" + "items": "#mineralogy:slabs/tuff/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json index cbfb4e0da..501b721dd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_slab" @@ -22,9 +20,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff_smooth_brick" - ] + "items": "mineralogy:tuff_smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json index 5d9cab897..d2f6138b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/smooth_brick" + "items": "#mineralogy:stones/tuff/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json index 4bb603edd..b57e79651 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/smooth_brick" + "items": "#mineralogy:stones/tuff/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json index 9afcfeeaf..7c1d40fbe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_furnace" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:slabs/tuff/smooth" + "items": "#mineralogy:slabs/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json index 0f2025a14..2147999a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_slab" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/smooth" + "items": "#mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json index 54acf0164..9aab09ffb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/smooth" + "items": "#mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json index 83e30391a..5a4bcaa79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, "rewards": { "recipes": [ "mineralogy:tuff_smooth_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff/smooth" + "items": "#mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json index 6f93df7c6..2feb0bdbf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, "rewards": { "recipes": [ "mineralogy:tuff_stairs" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff" + "items": "#mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json index 1f8a0be3c..8561df351 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json @@ -16,9 +16,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:tuff" - ] + "items": "mineralogy:tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json index a405728b8..d96de902e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, "rewards": { "recipes": [ "mineralogy:tuff_wall" @@ -22,7 +20,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:stones/tuff" + "items": "#mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json index 453c3e425..122e0cebd 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick", + "id": "mineralogy:amphibolite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json index 94d609746..1ad88b911 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_brick", + "id": "mineralogy:amphibolite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json index f86207cb5..d631a1920 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick_furnace", + "id": "mineralogy:amphibolite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json index 70df3665f..336cec1f7 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick_slab", + "id": "mineralogy:amphibolite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json index 13e4a7bbf..da6b1c552 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", + "id": "mineralogy:amphibolite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json index 58b704499..52c90df65 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_brick", + "id": "mineralogy:amphibolite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json index 8d2b7f11c..02a0139a1 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick_stairs", + "id": "mineralogy:amphibolite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json index e9cae8747..43a9ed05b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", + "id": "mineralogy:amphibolite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json index 2ec93fadd..c51609b6e 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick_wall", + "id": "mineralogy:amphibolite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json index 03c6bad14..c414e2bb1 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", + "id": "mineralogy:amphibolite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json index c0098398a..7fd697aaa 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json index 98703c45b..536c38bf3 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_furnace", + "id": "mineralogy:amphibolite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json index c35f5a544..eba01573e 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_brick", + "id": "mineralogy:amphibolite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json index 1337dff97..5024575b4 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth", + "id": "mineralogy:amphibolite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json index 3901a115f..7225ddc32 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", + "id": "mineralogy:amphibolite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json index d020185d4..28f0541ae 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", + "id": "mineralogy:amphibolite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json index 930c34318..fbc01b7a8 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", + "id": "mineralogy:amphibolite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json index a82ef8008..c9a42f6a9 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_slab", + "id": "mineralogy:amphibolite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json index e341c97c9..10d3a2e57 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite", + "id": "mineralogy:amphibolite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json index db55dafba..eb6f93d92 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick_slab", + "id": "mineralogy:amphibolite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json index 80149acdf..d4027287e 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_stairs", + "id": "mineralogy:amphibolite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json index 3e3d5fc4d..4612372b7 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick_stairs", + "id": "mineralogy:amphibolite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json index b695805e4..521eb0fed 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth_wall", + "id": "mineralogy:amphibolite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json index 3333651b5..762d3d611 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_brick_wall", + "id": "mineralogy:amphibolite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json index 28c4c4bc2..61b512f0c 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_relief_axe", + "id": "mineralogy:amphibolite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json index f9d714b55..8600063fd 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_blank", + "id": "mineralogy:amphibolite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json index 0bbea4c43..7d83c3bbc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_cross", + "id": "mineralogy:amphibolite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json index 3c56279b9..16ed9a272 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_hammer", + "id": "mineralogy:amphibolite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json index 9b7a1caea..8f7d81ad6 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_relief_hoe", + "id": "mineralogy:amphibolite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json index 853b6d32c..086998998 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_horizontal", + "id": "mineralogy:amphibolite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json index c6d1ee955..01569b939 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_i", + "id": "mineralogy:amphibolite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json index 5928bcd68..6af05f0d1 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_left", + "id": "mineralogy:amphibolite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json index 1f7199854..b9ba50a5b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_relief_pickaxe", + "id": "mineralogy:amphibolite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json index 3fa089094..ab6f4cd24 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_plus", + "id": "mineralogy:amphibolite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json index dc6d5ac0d..8c95b2b99 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_relief_right", + "id": "mineralogy:amphibolite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json index 8c1f675a8..2065febe1 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_relief_sword", + "id": "mineralogy:amphibolite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json index 3e6b8f79e..dc0fe1746 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_relief_vertical", + "id": "mineralogy:amphibolite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json index 411eb7575..be11f126b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_slab", + "id": "mineralogy:amphibolite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json index af29008fd..eff843b23 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:amphibolite_smooth", + "id": "mineralogy:amphibolite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json index ac8ad85b8..2098345a5 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick", + "id": "mineralogy:amphibolite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json index 331cc216e..b4f7e1e93 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_furnace", + "id": "mineralogy:amphibolite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json index b8a61c0bd..946b9e37f 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", + "id": "mineralogy:amphibolite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json index 62b24ee0a..f9f5a057a 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", + "id": "mineralogy:amphibolite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json index 7348579f4..b8c595f36 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", + "id": "mineralogy:amphibolite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json index 373a99972..f90380ad4 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_furnace", + "id": "mineralogy:amphibolite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json index 9e7c7617b..253d43816 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_slab", + "id": "mineralogy:amphibolite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json index e1540488d..3eb613510 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_stairs", + "id": "mineralogy:amphibolite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json index 909f4b2fe..8bc194c1a 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_smooth_wall", + "id": "mineralogy:amphibolite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json index 1c0862866..cc6fd1878 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_stairs", + "id": "mineralogy:amphibolite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_to_stone.json b/src/main/resources/data/mineralogy/recipes/amphibolite_to_stone.json index 4de115403..17edeb70b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:amphibolite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json index 5d110ed27..762fa659d 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:amphibolite_wall", + "id": "mineralogy:amphibolite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_brick.json index ca0d6bdff..ad5fed0a4 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick", + "id": "mineralogy:andesite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json index 2dc7dc7a8..bf4a80a25 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_brick", + "id": "mineralogy:andesite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json index 5b9492275..febfb7c7d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick_furnace", + "id": "mineralogy:andesite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json index 47a4616a1..ad717b95a 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick_slab", + "id": "mineralogy:andesite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json index 4caff4781..c3a82a101 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_brick_slab", + "id": "mineralogy:andesite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json index 79a3843d1..d2e2f5ab2 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_brick", + "id": "mineralogy:andesite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json index 0c149f5c0..d31c3dba0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick_stairs", + "id": "mineralogy:andesite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json index 4b8da3aa4..098221799 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", + "id": "mineralogy:andesite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json index 2057e3d5a..0c2239d6c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick_wall", + "id": "mineralogy:andesite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json index c691a2f05..0e7482064 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_brick_wall", + "id": "mineralogy:andesite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json index f27ce6f91..6ade4dd7f 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json index f2aadfeed..989a7f627 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:andesite_furnace", + "id": "mineralogy:andesite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json index 2f855a787..d2b9ec4ed 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_brick", + "id": "mineralogy:andesite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json index c4f37d12f..153390fd7 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth", + "id": "mineralogy:andesite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json index 8ae5c0382..94b4f58fb 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick_slab", + "id": "mineralogy:andesite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json index 70272b960..3a6463f8d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", + "id": "mineralogy:andesite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json index 920d37b6f..d9ff54c4c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick_wall", + "id": "mineralogy:andesite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json index 47060a117..b7adf267c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_slab", + "id": "mineralogy:andesite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json index 6287fac1d..4caeae4db 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite", + "id": "mineralogy:andesite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json index 948588612..6e60d4099 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick_slab", + "id": "mineralogy:andesite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json index 86257d7d6..e460ab883 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_stairs", + "id": "mineralogy:andesite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json index 7e49fd2dc..5a5cf74f0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick_stairs", + "id": "mineralogy:andesite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json index 3e6fa19c5..266f5d2bb 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_wall", + "id": "mineralogy:andesite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json index d3a30688a..241cb4122 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:andesite_brick_wall", + "id": "mineralogy:andesite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json index 6524b2412..7db6264f4 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:andesite_relief_axe", + "id": "mineralogy:andesite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json index 8f6590ed7..60045d4c6 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_blank", + "id": "mineralogy:andesite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json index b58bf18a6..6861b88c8 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_cross", + "id": "mineralogy:andesite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json index b8bf02361..4bacff095 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_hammer", + "id": "mineralogy:andesite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json index 84bd18abf..92e2bff6c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:andesite_relief_hoe", + "id": "mineralogy:andesite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json index 349cdcdd3..fbedcc91d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_horizontal", + "id": "mineralogy:andesite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json index 0fd34ca1b..b3f26cc44 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_i", + "id": "mineralogy:andesite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json index 574b9922e..a2fc6c84c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_left", + "id": "mineralogy:andesite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json index f092c63e1..e049c1b22 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:andesite_relief_pickaxe", + "id": "mineralogy:andesite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json index 30743754e..e57d03df1 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_plus", + "id": "mineralogy:andesite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json index cf490745c..db36ea3cf 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:andesite_relief_right", + "id": "mineralogy:andesite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json index 87a328ffc..8608ccc94 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:andesite_relief_sword", + "id": "mineralogy:andesite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json index 9e98998ad..6fffc338b 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_relief_vertical", + "id": "mineralogy:andesite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_slab.json index a3bce676c..554ec5af2 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:andesite_slab", + "id": "mineralogy:andesite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json index 3e24ca4fa..c7d327ddd 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:andesite_slab", + "id": "mineralogy:andesite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json index f47a019bf..9936d6819 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "minecraft:andesite_slab", + "id": "minecraft:andesite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json index b3cdb39da..02729cccb 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth", + "id": "mineralogy:andesite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json index a3ba38340..0d1954e7e 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick", + "id": "mineralogy:andesite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json index 22f3e62f8..f219eae4b 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick_furnace", + "id": "mineralogy:andesite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json index 3f2cf6d1e..f51dba6a8 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick_slab", + "id": "mineralogy:andesite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json index 9cb1071e7..a4fb60bb1 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", + "id": "mineralogy:andesite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json index 8e97973ce..d30a0a5c1 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_brick_wall", + "id": "mineralogy:andesite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json index 6e667c45a..87d21544c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_furnace", + "id": "mineralogy:andesite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json index 22f0f9bfa..1acdb3719 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_slab", + "id": "mineralogy:andesite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json index b9739fee2..e781bdc06 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:andesite_smooth_slab", + "id": "mineralogy:andesite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json index 377fa659d..55309efae 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "minecraft:polished_andesite_slab", + "id": "minecraft:polished_andesite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json index f0b4c094b..4744a9000 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_stairs", + "id": "mineralogy:andesite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json index b70718814..3818701f0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:andesite_smooth_wall", + "id": "mineralogy:andesite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json index fb9ae2f31..3d92835cc 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:andesite_stairs", + "id": "mineralogy:andesite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/andesite_to_stone.json b/src/main/resources/data/mineralogy/recipes/andesite_to_stone.json index a4f20117b..836df6a80 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:andesite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_wall.json index c6cdfe132..37d131104 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:andesite_wall", + "id": "mineralogy:andesite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_brick.json index be06b1a7a..00e01d5b5 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick", + "id": "mineralogy:basalt_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json index 26d24228d..4b2b130a1 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_brick", + "id": "mineralogy:basalt_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json index d72fcc204..881b54e5d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick_furnace", + "id": "mineralogy:basalt_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json index 6a8a3f9d2..fc20800ca 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick_slab", + "id": "mineralogy:basalt_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json index c0fd82343..a867e75f8 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_brick_slab", + "id": "mineralogy:basalt_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json index 5cc909e50..364c1cd33 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_brick", + "id": "mineralogy:basalt_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json index 2f4375a51..27e8fe13d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick_stairs", + "id": "mineralogy:basalt_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json index 59cb9a686..9490aaac2 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", + "id": "mineralogy:basalt_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json index 6042e6a89..0c528a744 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick_wall", + "id": "mineralogy:basalt_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json index 33139eb19..cb6148012 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_brick_wall", + "id": "mineralogy:basalt_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json index cc73b4a15..6dd85c30e 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json index d5bc3d157..8c7bd9112 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basalt_furnace", + "id": "mineralogy:basalt_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json index edb2f1630..9d6cf6629 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_brick", + "id": "mineralogy:basalt_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json index 6652acc89..f6ea85f24 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth", + "id": "mineralogy:basalt_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json index 4edf1ce5f..35b1c4c53 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick_slab", + "id": "mineralogy:basalt_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json index 3f8acbe72..8858ef1b0 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", + "id": "mineralogy:basalt_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json index 24f46632d..fc3d0d58d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick_wall", + "id": "mineralogy:basalt_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json index 8b7369273..6d1add896 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_slab", + "id": "mineralogy:basalt_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json index f5041e2de..d0715a020 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt", + "id": "mineralogy:basalt", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json index c15f0fa86..ef6c92f19 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick_slab", + "id": "mineralogy:basalt_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json index d53ff4f16..683e54e2f 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_stairs", + "id": "mineralogy:basalt_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json index 0011e2e28..bd002de97 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick_stairs", + "id": "mineralogy:basalt_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json index 00e16ecf5..bc8fb6873 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth_wall", + "id": "mineralogy:basalt_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json index 8bc0d9335..7e45e7401 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basalt_brick_wall", + "id": "mineralogy:basalt_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json index eaf0d11ff..5f931fc24 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basalt_relief_axe", + "id": "mineralogy:basalt_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json index 3becde056..57204a839 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_blank", + "id": "mineralogy:basalt_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json index f78e6f802..5ecfee456 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_cross", + "id": "mineralogy:basalt_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json index 58dd5bf17..fef20a8d5 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_hammer", + "id": "mineralogy:basalt_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json index e4fba3078..136e1a32c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basalt_relief_hoe", + "id": "mineralogy:basalt_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json index 961acf087..93bffceff 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_horizontal", + "id": "mineralogy:basalt_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json index 094c59408..d708d331b 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_i", + "id": "mineralogy:basalt_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json index 60d063452..30900f63e 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_left", + "id": "mineralogy:basalt_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json index 99ffbf9ed..bdef90f37 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basalt_relief_pickaxe", + "id": "mineralogy:basalt_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json index 93a6f9aac..45ff91044 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_plus", + "id": "mineralogy:basalt_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json index c2bb570ad..d85279662 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:basalt_relief_right", + "id": "mineralogy:basalt_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json index c44490cc2..03dd8fe7e 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basalt_relief_sword", + "id": "mineralogy:basalt_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json index 957d5a98c..7eb92cdbc 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_relief_vertical", + "id": "mineralogy:basalt_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_slab.json index 20bd72af5..d3de02f12 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basalt_slab", + "id": "mineralogy:basalt_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json index 90fcdffd8..e496ed996 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:basalt_smooth", + "id": "mineralogy:basalt_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json index 31eb088fe..4a04dcdd7 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick", + "id": "mineralogy:basalt_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json index 92c75ae01..7704ef8e9 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick_furnace", + "id": "mineralogy:basalt_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json index 5abb85971..9e8758b1c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick_slab", + "id": "mineralogy:basalt_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json index 7ba872283..35ecb31cf 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", + "id": "mineralogy:basalt_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json index 3474b052a..5bf080763 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_brick_wall", + "id": "mineralogy:basalt_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json index 620ef9823..a37bdabd0 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_furnace", + "id": "mineralogy:basalt_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json index b7f0a79bb..d50eedf46 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_slab", + "id": "mineralogy:basalt_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json index 7187bdeb5..3f17a4126 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_stairs", + "id": "mineralogy:basalt_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json index 1935f72ac..5d4018b0a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basalt_smooth_wall", + "id": "mineralogy:basalt_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json index 4a8fa99a7..b5a182b14 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basalt_stairs", + "id": "mineralogy:basalt_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basalt_to_stone.json b/src/main/resources/data/mineralogy/recipes/basalt_to_stone.json index 73078dd4d..52ce0d963 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:basalt" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_wall.json index b84a9b096..76b93ad42 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basalt_wall", + "id": "mineralogy:basalt_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json index 2d3d54147..68bf516a0 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick", + "id": "mineralogy:basaltic_glass_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json index 00591911b..948202019 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", + "id": "mineralogy:basaltic_glass_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json index 07f3c1b5e..ddc7bf968 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick_furnace", + "id": "mineralogy:basaltic_glass_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json index 175f9eefe..d7ce42bb0 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick_slab", + "id": "mineralogy:basaltic_glass_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json index cf40501a8..5c60d120a 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "id": "mineralogy:basaltic_glass_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json index 18c3b9d5b..30c5a1f52 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_brick", + "id": "mineralogy:basaltic_glass_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json index f273a3057..00213b7a6 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick_stairs", + "id": "mineralogy:basaltic_glass_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json index 4eca8ba64..e8b3c425e 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "id": "mineralogy:basaltic_glass_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json index 0077c9c89..f4577d177 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick_wall", + "id": "mineralogy:basaltic_glass_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json index c7f2af04c..40ce6597f 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "id": "mineralogy:basaltic_glass_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json index e2ed686fc..557aca2db 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json index 983eb9360..584e21b06 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_furnace", + "id": "mineralogy:basaltic_glass_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json index 2061bcffc..fd8aeed0c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", + "id": "mineralogy:basaltic_glass_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json index 1168fc2a6..895b078fe 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth", + "id": "mineralogy:basaltic_glass_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json index 02da055fa..265464a57 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "id": "mineralogy:basaltic_glass_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json index c852e0746..7930cd1a6 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "id": "mineralogy:basaltic_glass_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json index f55fde334..813bb8f4a 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "id": "mineralogy:basaltic_glass_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json index d0fb2045c..40defd782 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_slab", + "id": "mineralogy:basaltic_glass_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json index 704d16f79..508751741 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass", + "id": "mineralogy:basaltic_glass", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json index 21ddfdde3..ac68a9ef8 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick_slab", + "id": "mineralogy:basaltic_glass_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json index 42fe21eff..a4b2ba28b 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_stairs", + "id": "mineralogy:basaltic_glass_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json index 07a725679..799edf5d0 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick_stairs", + "id": "mineralogy:basaltic_glass_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json index 56455613b..2bdcbde39 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth_wall", + "id": "mineralogy:basaltic_glass_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json index 59cde80c0..3f5c6991d 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_brick_wall", + "id": "mineralogy:basaltic_glass_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json index 9c141cbb4..c1380c9b8 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_relief_axe", + "id": "mineralogy:basaltic_glass_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json index ef6298458..430fb0d9f 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_blank", + "id": "mineralogy:basaltic_glass_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json index 5ddfc89ec..9218cf73d 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_cross", + "id": "mineralogy:basaltic_glass_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json index 640fd2a46..468041d21 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_hammer", + "id": "mineralogy:basaltic_glass_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json index 551fca540..af75389d8 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_relief_hoe", + "id": "mineralogy:basaltic_glass_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json index 3c32e20ca..ee1cd3ad0 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_horizontal", + "id": "mineralogy:basaltic_glass_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json index 4b5562df6..5bb216a23 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_i", + "id": "mineralogy:basaltic_glass_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json index 0e2eb517f..5169476a3 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_left", + "id": "mineralogy:basaltic_glass_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json index 574a55754..6f3a7c378 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_relief_pickaxe", + "id": "mineralogy:basaltic_glass_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json index d39883f2d..63cb3fadc 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_plus", + "id": "mineralogy:basaltic_glass_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json index f41fb482b..ad676d5c2 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_relief_right", + "id": "mineralogy:basaltic_glass_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json index 8cde8271f..3cdc13d7a 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_relief_sword", + "id": "mineralogy:basaltic_glass_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json index 5557a894d..2c22e763b 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_relief_vertical", + "id": "mineralogy:basaltic_glass_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json index f6f5358d4..aa9eff064 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_slab", + "id": "mineralogy:basaltic_glass_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json index b0abeb2b7..db71393bd 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:basaltic_glass_smooth", + "id": "mineralogy:basaltic_glass_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json index 7a19f81a1..3915bf82d 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", + "id": "mineralogy:basaltic_glass_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json index 3f1e36a45..666c169fc 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_furnace", + "id": "mineralogy:basaltic_glass_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json index a16a6ab7b..9b4ab9236 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "id": "mineralogy:basaltic_glass_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json index 7aa99b80d..fe88313ac 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "id": "mineralogy:basaltic_glass_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json index d37157ce1..6e2e4a5e0 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "id": "mineralogy:basaltic_glass_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json index aeb452110..742b3335d 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_furnace", + "id": "mineralogy:basaltic_glass_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json index 3544371ec..c7ca7d94a 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_slab", + "id": "mineralogy:basaltic_glass_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json index d29247ff8..e5ae2f34d 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_stairs", + "id": "mineralogy:basaltic_glass_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json index 67106ab41..ca4cc7e72 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_wall", + "id": "mineralogy:basaltic_glass_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json index c2193f7f7..80820dedf 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_stairs", + "id": "mineralogy:basaltic_glass_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_to_stone.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_to_stone.json index 6379a499e..4288111df 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:basaltic_glass" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json index 99027cc6e..c5e7afc45 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:basaltic_glass_wall", + "id": "mineralogy:basaltic_glass_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/chalk.json b/src/main/resources/data/mineralogy/recipes/chalk.json index df6fd9a5c..211b1d8e1 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk.json +++ b/src/main/resources/data/mineralogy/recipes/chalk.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:chalk", + "id": "mineralogy:chalk", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/recipes/chalk_dust.json index 7bf9b902d..624213b7d 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk_dust.json +++ b/src/main/resources/data/mineralogy/recipes/chalk_dust.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk_dust" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -13,7 +11,7 @@ } ], "result": { - "item": "mineralogy:chalk_dust", + "id": "mineralogy:chalk_dust", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/cobblestone.json b/src/main/resources/data/mineralogy/recipes/cobblestone.json index 1c00a6982..08aafbfdb 100644 --- a/src/main/resources/data/mineralogy/recipes/cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json index ee96750ab..9d06f1347 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick", + "id": "mineralogy:conglomerate_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json index 56a499f8e..876cec779 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_brick", + "id": "mineralogy:conglomerate_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json index eb8ca9ce2..cc78c278e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick_furnace", + "id": "mineralogy:conglomerate_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json index 5391794f9..ea3f66dbe 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick_slab", + "id": "mineralogy:conglomerate_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json index 5d4811fa5..4a0f2d0f5 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", + "id": "mineralogy:conglomerate_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json index 67031f8bf..cfbd39935 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_brick", + "id": "mineralogy:conglomerate_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json index c36d00442..e8849db6f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick_stairs", + "id": "mineralogy:conglomerate_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json index fea7a7b61..3874314b5 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", + "id": "mineralogy:conglomerate_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json index b09281edc..14ca192d1 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick_wall", + "id": "mineralogy:conglomerate_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json index 3ea54e7e1..dff65564a 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", + "id": "mineralogy:conglomerate_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json index 9cfa7fa4e..6cea6a4c8 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json index 683767f6e..8dea430a6 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_furnace", + "id": "mineralogy:conglomerate_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json index 9056418d1..1ce239f96 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_brick", + "id": "mineralogy:conglomerate_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json index 5dde8bc3a..966d79a8e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth", + "id": "mineralogy:conglomerate_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json index 3b16bf6f9..6d80326f7 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", + "id": "mineralogy:conglomerate_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json index b5f9dcbd5..de1727f4b 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", + "id": "mineralogy:conglomerate_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json index 41677ebba..fe1ca0e0c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", + "id": "mineralogy:conglomerate_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json index 41714cfe4..cec5ed09b 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_slab", + "id": "mineralogy:conglomerate_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json index d1648a921..e93938787 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate", + "id": "mineralogy:conglomerate", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json index e39828762..0e2ec8e1f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick_slab", + "id": "mineralogy:conglomerate_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json index 2a8698eb2..769c39322 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_stairs", + "id": "mineralogy:conglomerate_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json index 340b07933..46ae81cc1 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick_stairs", + "id": "mineralogy:conglomerate_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json index 0e941809f..d342a8ccc 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth_wall", + "id": "mineralogy:conglomerate_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json index b36d398d8..edcb62c88 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_brick_wall", + "id": "mineralogy:conglomerate_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json index d3388fac2..93e9d44d1 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_relief_axe", + "id": "mineralogy:conglomerate_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json index a7f15c1ce..698b3afe0 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_blank", + "id": "mineralogy:conglomerate_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json index 8c26fa1c1..4180c4091 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_cross", + "id": "mineralogy:conglomerate_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json index 7313c6d3d..4d1a14812 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_hammer", + "id": "mineralogy:conglomerate_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json index f32160046..d33da17ea 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_relief_hoe", + "id": "mineralogy:conglomerate_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json index 04f1da6d6..f416281b1 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_horizontal", + "id": "mineralogy:conglomerate_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json index bd485ec3e..d9476fb58 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_i", + "id": "mineralogy:conglomerate_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json index 543314024..fdb63a17b 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_left", + "id": "mineralogy:conglomerate_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json index 1f5f5f8af..3e0e8f3c7 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_relief_pickaxe", + "id": "mineralogy:conglomerate_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json index 7dcf57b93..a453889e8 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_plus", + "id": "mineralogy:conglomerate_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json index 6527ca052..c740d32c9 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_relief_right", + "id": "mineralogy:conglomerate_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json index 56934306b..9543bb8bd 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_relief_sword", + "id": "mineralogy:conglomerate_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json index f2f9aa9e4..a635f548e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_relief_vertical", + "id": "mineralogy:conglomerate_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json index b99054719..088224556 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_slab", + "id": "mineralogy:conglomerate_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json index d7e3ce26c..54d754f0c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:conglomerate_smooth", + "id": "mineralogy:conglomerate_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json index b896b07af..46adb7f05 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick", + "id": "mineralogy:conglomerate_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json index 14e98fba7..d97109145 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_furnace", + "id": "mineralogy:conglomerate_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json index b66269fa3..e2ae6817e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", + "id": "mineralogy:conglomerate_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json index c93daf202..fa8c9e041 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", + "id": "mineralogy:conglomerate_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json index bb641ee5f..6b8492920 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", + "id": "mineralogy:conglomerate_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json index 5a8b3300f..707aa59a0 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_furnace", + "id": "mineralogy:conglomerate_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json index 7faa802b8..73dede33f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_slab", + "id": "mineralogy:conglomerate_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json index f743d9053..c74b0fcee 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_stairs", + "id": "mineralogy:conglomerate_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json index a786af1a0..09def3a6c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_smooth_wall", + "id": "mineralogy:conglomerate_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json index 66ec82540..4b7d71d0c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_stairs", + "id": "mineralogy:conglomerate_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_to_stone.json b/src/main/resources/data/mineralogy/recipes/conglomerate_to_stone.json index b1278fefe..2245f6b3b 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:conglomerate" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json index 7e50d1a07..3441423fa 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:conglomerate_wall", + "id": "mineralogy:conglomerate_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_brick.json index 3370be667..90083686e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick", + "id": "mineralogy:diabase_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json index 3ae79a8c8..663e181ce 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_brick", + "id": "mineralogy:diabase_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json index 7630fda91..f8647a535 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick_furnace", + "id": "mineralogy:diabase_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json index 26ac43cae..0ccda607b 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick_slab", + "id": "mineralogy:diabase_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json index 72b3d5879..5214b877a 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_brick_slab", + "id": "mineralogy:diabase_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json index 7aa5595bf..9cf731c7c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_brick", + "id": "mineralogy:diabase_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json index f499d2472..f8139e100 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick_stairs", + "id": "mineralogy:diabase_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json index ff1c5e7e4..15fe85aee 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", + "id": "mineralogy:diabase_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json index d4b425c65..245bfcc7c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick_wall", + "id": "mineralogy:diabase_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json index dfe95bab2..362a76bb8 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_brick_wall", + "id": "mineralogy:diabase_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json index df9dd0b04..efd305391 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json index d7adfb4d9..5c2b000aa 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diabase_furnace", + "id": "mineralogy:diabase_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json index 7184d5405..ef3eadf62 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_brick", + "id": "mineralogy:diabase_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json index 8b40abb1a..8ff455c97 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth", + "id": "mineralogy:diabase_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json index 65375ab47..cd359eb93 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick_slab", + "id": "mineralogy:diabase_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json index 69ac7e4e6..5899beba1 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", + "id": "mineralogy:diabase_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json index d7eba70a6..72baeb97e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick_wall", + "id": "mineralogy:diabase_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json index beb81151d..f752f0e7c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_slab", + "id": "mineralogy:diabase_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json index 9cbf3e78b..821510bdb 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase", + "id": "mineralogy:diabase", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json index c215be380..d6fa25c73 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick_slab", + "id": "mineralogy:diabase_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json index 0ff68ca90..4983887ad 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_stairs", + "id": "mineralogy:diabase_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json index e8cfe96a4..ac8461213 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick_stairs", + "id": "mineralogy:diabase_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json index 3900a2dd3..41d599c0e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth_wall", + "id": "mineralogy:diabase_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json index c5cfcffd6..5e3034c1b 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diabase_brick_wall", + "id": "mineralogy:diabase_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json index 72ad980ce..6152d076e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diabase_relief_axe", + "id": "mineralogy:diabase_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json index 79f084b1f..007de32d1 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_blank", + "id": "mineralogy:diabase_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json index 8cb73513a..98aca81f2 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_cross", + "id": "mineralogy:diabase_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json index 97dce4293..4f2b02b2b 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_hammer", + "id": "mineralogy:diabase_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json index de6e77f56..2487d1164 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diabase_relief_hoe", + "id": "mineralogy:diabase_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json index e8a26dbd1..167530734 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_horizontal", + "id": "mineralogy:diabase_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json index c3838a68e..8f7049007 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_i", + "id": "mineralogy:diabase_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json index 8cca00780..5f7a4f7a3 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_left", + "id": "mineralogy:diabase_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json index 8e6aafde7..ee44ea9d8 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diabase_relief_pickaxe", + "id": "mineralogy:diabase_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json index 2d11efbda..6e59ea7cd 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_plus", + "id": "mineralogy:diabase_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json index a363a4885..4292e3d62 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:diabase_relief_right", + "id": "mineralogy:diabase_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json index b02afa947..b3fa95c44 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diabase_relief_sword", + "id": "mineralogy:diabase_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json index a3b684f94..cd520a2d0 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_relief_vertical", + "id": "mineralogy:diabase_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_slab.json index 62cdb233b..a91eaa1d1 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diabase_slab", + "id": "mineralogy:diabase_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json index 60f90d89d..04d454087 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:diabase_smooth", + "id": "mineralogy:diabase_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json index 05363daa3..0c85de0f7 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick", + "id": "mineralogy:diabase_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json index 0e8df79e0..3f6a956f4 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick_furnace", + "id": "mineralogy:diabase_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json index 2dbd88c9c..fb7d0beb1 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick_slab", + "id": "mineralogy:diabase_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json index c1c2dcf43..cd6405d2c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", + "id": "mineralogy:diabase_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json index 85556a4f0..9d32ea0a8 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_brick_wall", + "id": "mineralogy:diabase_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json index b4b308aeb..1d4d35301 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_furnace", + "id": "mineralogy:diabase_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json index 31dfe3599..42878eee3 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_slab", + "id": "mineralogy:diabase_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json index c69db0a98..adff84b5f 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_stairs", + "id": "mineralogy:diabase_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json index f71a4733e..4abab25f8 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diabase_smooth_wall", + "id": "mineralogy:diabase_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json index ee7c11732..51f641951 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diabase_stairs", + "id": "mineralogy:diabase_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diabase_to_stone.json b/src/main/resources/data/mineralogy/recipes/diabase_to_stone.json index c8a06cf98..5eb6ee887 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:diabase" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_wall.json index a103fc633..27f5eef13 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diabase_wall", + "id": "mineralogy:diabase_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_brick.json index 855f30ced..159beaaea 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick", + "id": "mineralogy:diorite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json index 1dc354d5d..d17734341 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_brick", + "id": "mineralogy:diorite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json index 3ccf0f129..6767a2099 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick_furnace", + "id": "mineralogy:diorite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json index ea3c7ccf4..b04c85548 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick_slab", + "id": "mineralogy:diorite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json index 32895ddf4..c66f2eac4 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_brick_slab", + "id": "mineralogy:diorite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json index d586b662d..193e74bcc 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_brick", + "id": "mineralogy:diorite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json index e3d84c880..4a4c613dc 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick_stairs", + "id": "mineralogy:diorite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json index 770580c3f..253d27506 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", + "id": "mineralogy:diorite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json index 3c6be1b55..f0336d920 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick_wall", + "id": "mineralogy:diorite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json index 8d4e2d828..a9fcea146 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_brick_wall", + "id": "mineralogy:diorite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json index 7f266ea74..bdaf1ea6c 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json index 530ec1434..f544177ea 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diorite_furnace", + "id": "mineralogy:diorite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json index c714151a8..cd46eaa3b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_brick", + "id": "mineralogy:diorite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json index 645bd9f56..e87582001 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth", + "id": "mineralogy:diorite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json index 58fcd4bb5..356579413 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick_slab", + "id": "mineralogy:diorite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json index 6cc5550b9..97f2a6051 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", + "id": "mineralogy:diorite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json index 772e96bfd..9450c870c 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick_wall", + "id": "mineralogy:diorite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json index a74560078..8c8ba5ff4 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_slab", + "id": "mineralogy:diorite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json index 4f4536129..c7a14616e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite", + "id": "mineralogy:diorite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json index eb1d43820..16984ffbb 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick_slab", + "id": "mineralogy:diorite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json index e340066aa..711b2761e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_stairs", + "id": "mineralogy:diorite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json index 87e66690e..d72192fa1 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick_stairs", + "id": "mineralogy:diorite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json index c0b48a19b..f1117584d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_wall", + "id": "mineralogy:diorite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json index c744d1d0f..5fd54cffe 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:diorite_brick_wall", + "id": "mineralogy:diorite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json index 5728f7e27..540d669c6 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diorite_relief_axe", + "id": "mineralogy:diorite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json index a9cfef3c9..955e65e22 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_blank", + "id": "mineralogy:diorite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json index 62b77ff19..5cb23f284 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_cross", + "id": "mineralogy:diorite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json index ab6fa1242..546dde953 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_hammer", + "id": "mineralogy:diorite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json index b1652e2c8..183cb0ab5 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diorite_relief_hoe", + "id": "mineralogy:diorite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json index 27cad0945..04c401823 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_horizontal", + "id": "mineralogy:diorite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json index 6b288993c..cb97d29eb 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_i", + "id": "mineralogy:diorite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json index b5a801937..509e35719 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_left", + "id": "mineralogy:diorite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json index 67a87ade4..1bc28531e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diorite_relief_pickaxe", + "id": "mineralogy:diorite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json index a967febe7..502c5c8b9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_plus", + "id": "mineralogy:diorite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json index b35a8722d..a7fc1745d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:diorite_relief_right", + "id": "mineralogy:diorite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json index 608d582aa..d305bdb8f 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:diorite_relief_sword", + "id": "mineralogy:diorite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json index f790a60f2..83ec39123 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_relief_vertical", + "id": "mineralogy:diorite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_slab.json index 0d3e681a1..ee359e693 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diorite_slab", + "id": "mineralogy:diorite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json index 552f007cc..025e6dfbb 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:diorite_slab", + "id": "mineralogy:diorite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json index a68f09649..70eb52599 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "minecraft:diorite_slab", + "id": "minecraft:diorite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json index cdd65ab3a..9a2661952 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth", + "id": "mineralogy:diorite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json index 02f222b9f..046c2ad49 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick", + "id": "mineralogy:diorite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json index 93a487547..a6e857415 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick_furnace", + "id": "mineralogy:diorite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json index 9ee30e735..2b2844358 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick_slab", + "id": "mineralogy:diorite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json index caf241a45..6b0184f87 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", + "id": "mineralogy:diorite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json index 864b0463f..8fa3b6d77 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_brick_wall", + "id": "mineralogy:diorite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json index 6e5fddcc0..ad5829275 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_furnace", + "id": "mineralogy:diorite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json index 4f9463834..066f2151c 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_slab", + "id": "mineralogy:diorite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json index 8c2d1c504..1719e119b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:diorite_smooth_slab", + "id": "mineralogy:diorite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json index bef0c6715..a9322ae97 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "minecraft:polished_diorite_slab", + "id": "minecraft:polished_diorite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json index 1a31a3a0a..b38fb3b00 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_stairs", + "id": "mineralogy:diorite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json index f43abbaba..7a8e48e2d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diorite_smooth_wall", + "id": "mineralogy:diorite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json index 3a46620f1..4e40c7dc3 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:diorite_stairs", + "id": "mineralogy:diorite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/diorite_to_stone.json b/src/main/resources/data/mineralogy/recipes/diorite_to_stone.json index d5a9bfe49..a8df6851b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:diorite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_wall.json index 30a1edc3a..fde3a0be2 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:diorite_wall", + "id": "mineralogy:diorite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json index 247aa3567..8aa16a28d 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick", + "id": "mineralogy:dolomite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json index e20e1f4ff..7544fbc8b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_brick", + "id": "mineralogy:dolomite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json index d2dbc1289..fe4ff30c4 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick_furnace", + "id": "mineralogy:dolomite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json index a711ffd67..652a9e3d9 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick_slab", + "id": "mineralogy:dolomite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json index 6c78073b8..ff595665a 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", + "id": "mineralogy:dolomite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json index 977754495..678a669f4 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_brick", + "id": "mineralogy:dolomite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json index ff7443a11..e5d093803 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick_stairs", + "id": "mineralogy:dolomite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json index b95a84022..046228b98 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", + "id": "mineralogy:dolomite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json index 0b1c85529..877a8b935 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick_wall", + "id": "mineralogy:dolomite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json index 786f626a6..cc4f7a08d 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", + "id": "mineralogy:dolomite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json index 8e0936baa..c39324cec 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json index abb0e5cc3..3ba992d9a 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:dolomite_furnace", + "id": "mineralogy:dolomite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json index b2c8420f3..67f49dd5f 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_brick", + "id": "mineralogy:dolomite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json index 8fc9cd230..49532ad1b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth", + "id": "mineralogy:dolomite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json index 57bae7ceb..6936400a9 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", + "id": "mineralogy:dolomite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json index 182e828eb..761f5aeaf 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", + "id": "mineralogy:dolomite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json index ca99117e4..e2e972809 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", + "id": "mineralogy:dolomite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json index a0c78ea61..23de544b6 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_slab", + "id": "mineralogy:dolomite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json index 1c079d27a..6878079de 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite", + "id": "mineralogy:dolomite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json index 951359f1e..243a12b49 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick_slab", + "id": "mineralogy:dolomite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json index de2b07fe7..1b6f66922 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_stairs", + "id": "mineralogy:dolomite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json index 9c0ac23eb..a1f268df2 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick_stairs", + "id": "mineralogy:dolomite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json index ae277940f..227491f6d 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth_wall", + "id": "mineralogy:dolomite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json index b66c0f67c..a92df141b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:dolomite_brick_wall", + "id": "mineralogy:dolomite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json index 4ff0c36ed..28c21991e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:dolomite_relief_axe", + "id": "mineralogy:dolomite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json index 42cb39ca2..b7798acdd 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_blank", + "id": "mineralogy:dolomite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json index 287dd950c..3268a39fb 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_cross", + "id": "mineralogy:dolomite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json index f0b0f60f3..dbd2dbd55 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_hammer", + "id": "mineralogy:dolomite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json index edaf68a55..1224f590e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:dolomite_relief_hoe", + "id": "mineralogy:dolomite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json index 0d834c68b..a54927ff9 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_horizontal", + "id": "mineralogy:dolomite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json index b01f645aa..014d626b0 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_i", + "id": "mineralogy:dolomite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json index 63718827f..85869841f 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_left", + "id": "mineralogy:dolomite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json index 35b75f738..368249328 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:dolomite_relief_pickaxe", + "id": "mineralogy:dolomite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json index 6b1392e10..f018a54d6 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_plus", + "id": "mineralogy:dolomite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json index ae6043a51..bc42920c3 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:dolomite_relief_right", + "id": "mineralogy:dolomite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json index 654fd0f71..496c710d9 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:dolomite_relief_sword", + "id": "mineralogy:dolomite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json index 1b095148c..a2eb294c3 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_relief_vertical", + "id": "mineralogy:dolomite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json index 698501c67..a2bdf9340 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:dolomite_slab", + "id": "mineralogy:dolomite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json index c82d94066..b3d119544 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:dolomite_smooth", + "id": "mineralogy:dolomite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json index ce3d3f6b6..53adca752 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick", + "id": "mineralogy:dolomite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json index 70550fa87..9dba0f8ac 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_furnace", + "id": "mineralogy:dolomite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json index 2fff76ab8..6b0fb4f7a 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", + "id": "mineralogy:dolomite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json index 0be129cfe..9f15cbfb7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", + "id": "mineralogy:dolomite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json index f8379dc89..bbcc3dbdd 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", + "id": "mineralogy:dolomite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json index 6ad18dbfa..3762050e1 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_furnace", + "id": "mineralogy:dolomite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json index 5305bba71..957f54bec 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_slab", + "id": "mineralogy:dolomite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json index dd63a8210..a76c4104f 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_stairs", + "id": "mineralogy:dolomite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json index 319a41c24..63ef06bcd 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:dolomite_smooth_wall", + "id": "mineralogy:dolomite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json index 781d04c81..8df7b0258 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:dolomite_stairs", + "id": "mineralogy:dolomite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_to_stone.json b/src/main/resources/data/mineralogy/recipes/dolomite_to_stone.json index 43ed4cb6b..15073a049 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:dolomite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json index 20bff4ef8..ae0bed28b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:dolomite_wall", + "id": "mineralogy:dolomite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/drywall.json b/src/main/resources/data/mineralogy/recipes/drywall.json index b71703b0a..8a82f3edd 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall.json +++ b/src/main/resources/data/mineralogy/recipes/drywall.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -25,7 +28,7 @@ } }, "result": { - "item": "mineralogy:drywall_white", + "id": "mineralogy:drywall_white", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/drywall_black.json b/src/main/resources/data/mineralogy/recipes/drywall_black.json index d32ff5407..8f8e69a60 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_black.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_black.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_black" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_black", + "id": "mineralogy:drywall_black", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_blue.json b/src/main/resources/data/mineralogy/recipes/drywall_blue.json index af4c9984a..9addd2b84 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_blue.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_blue.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_blue" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_blue", + "id": "mineralogy:drywall_blue", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_brown.json b/src/main/resources/data/mineralogy/recipes/drywall_brown.json index 2971b427c..d4c7ce75a 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_brown.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_brown.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_brown" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_brown", + "id": "mineralogy:drywall_brown", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_cyan.json b/src/main/resources/data/mineralogy/recipes/drywall_cyan.json index b05c4a4b4..860376703 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_cyan.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_cyan.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_cyan" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_cyan", + "id": "mineralogy:drywall_cyan", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_gray.json b/src/main/resources/data/mineralogy/recipes/drywall_gray.json index d830c919d..2a0b7b7dc 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_gray.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_gray.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_gray" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_gray", + "id": "mineralogy:drywall_gray", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_green.json b/src/main/resources/data/mineralogy/recipes/drywall_green.json index 5ec7747d8..64067b32d 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_green.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_green.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_green" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_green", + "id": "mineralogy:drywall_green", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json b/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json index 4b5a8ca1e..916fa667d 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_light_blue" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_light_blue", + "id": "mineralogy:drywall_light_blue", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_lime.json b/src/main/resources/data/mineralogy/recipes/drywall_lime.json index 49e516a2f..bdadf0123 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_lime.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_lime.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_lime" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_lime", + "id": "mineralogy:drywall_lime", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_magenta.json b/src/main/resources/data/mineralogy/recipes/drywall_magenta.json index 3b6becbbc..a5daa5728 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_magenta.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_magenta.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_magenta" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_magenta", + "id": "mineralogy:drywall_magenta", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_orange.json b/src/main/resources/data/mineralogy/recipes/drywall_orange.json index bc44afb24..774c75dd9 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_orange.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_orange.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_orange" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_orange", + "id": "mineralogy:drywall_orange", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_pink.json b/src/main/resources/data/mineralogy/recipes/drywall_pink.json index 95aa2f992..33b4fe763 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_pink.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_pink.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_pink" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_pink", + "id": "mineralogy:drywall_pink", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_purple.json b/src/main/resources/data/mineralogy/recipes/drywall_purple.json index 08b6c8b22..c4bbe9321 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_purple.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_purple.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_purple" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_purple", + "id": "mineralogy:drywall_purple", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_red.json b/src/main/resources/data/mineralogy/recipes/drywall_red.json index d32238599..42f65e773 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_red.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_red.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_red" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_red", + "id": "mineralogy:drywall_red", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_silver.json b/src/main/resources/data/mineralogy/recipes/drywall_silver.json index eb5b64b9e..ca03e3885 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_silver.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_silver.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_silver" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_silver", + "id": "mineralogy:drywall_silver", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_white.json b/src/main/resources/data/mineralogy/recipes/drywall_white.json index d16d04ebb..3598af3b4 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_white.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_white.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_white", + "id": "mineralogy:drywall_white", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_yellow.json b/src/main/resources/data/mineralogy/recipes/drywall_yellow.json index 8729674a9..4e11b4507 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_yellow.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_yellow.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_yellow" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:drywall_yellow", + "id": "mineralogy:drywall_yellow", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json index 89ad1221d..0a0b7f010 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick", + "id": "mineralogy:gabbro_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json index 906098a10..410bcbcf0 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_brick", + "id": "mineralogy:gabbro_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json index b6ba79a93..e9017b161 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick_furnace", + "id": "mineralogy:gabbro_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json index cff18c6b4..03ffe81d3 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick_slab", + "id": "mineralogy:gabbro_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json index baf76da25..6d9263ea8 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", + "id": "mineralogy:gabbro_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json index 7d2ae1d74..f07b0af47 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_brick", + "id": "mineralogy:gabbro_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json index c3bab0e43..fcf9ac329 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick_stairs", + "id": "mineralogy:gabbro_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json index f51e982ed..c5c00b75d 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", + "id": "mineralogy:gabbro_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json index fd5ebe22d..c03ea4edf 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick_wall", + "id": "mineralogy:gabbro_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json index 851e588b4..d1b874a2e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", + "id": "mineralogy:gabbro_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json index a0b50b2e2..626c76a4a 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json index 99997bd44..e3b99d8fa 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gabbro_furnace", + "id": "mineralogy:gabbro_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json index 89049e61e..82fa27531 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_brick", + "id": "mineralogy:gabbro_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json index fcdc02f6e..64737b790 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth", + "id": "mineralogy:gabbro_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json index 3fbe53dcc..3e52270ce 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", + "id": "mineralogy:gabbro_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json index 3716261a9..8c94ce9bf 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", + "id": "mineralogy:gabbro_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json index eb8a677fb..d42f776a8 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", + "id": "mineralogy:gabbro_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json index 9695f342c..03fe10796 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_slab", + "id": "mineralogy:gabbro_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json index 4c90d1cd4..658f63653 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro", + "id": "mineralogy:gabbro", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json index f8e4074ba..085a8a16b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick_slab", + "id": "mineralogy:gabbro_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json index f1852eafc..cbb6bb997 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_stairs", + "id": "mineralogy:gabbro_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json index 927a9fdbc..0bf363632 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick_stairs", + "id": "mineralogy:gabbro_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json index 595439d56..852c49918 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth_wall", + "id": "mineralogy:gabbro_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json index 63b10a024..31ec360ce 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gabbro_brick_wall", + "id": "mineralogy:gabbro_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json index a10e4e79f..31dc49dbf 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gabbro_relief_axe", + "id": "mineralogy:gabbro_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json index bfd880f32..023cecf8f 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_blank", + "id": "mineralogy:gabbro_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json index 408763cd7..c20c86395 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_cross", + "id": "mineralogy:gabbro_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json index ba360b6b4..d7e1360c3 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_hammer", + "id": "mineralogy:gabbro_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json index 9bcccc4e4..fb3f5f8d8 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gabbro_relief_hoe", + "id": "mineralogy:gabbro_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json index c1d28ce16..cb61013eb 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_horizontal", + "id": "mineralogy:gabbro_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json index 323272995..282ce3eab 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_i", + "id": "mineralogy:gabbro_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json index 103346fef..37c26993d 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_left", + "id": "mineralogy:gabbro_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json index f0d48a24d..60cc7d358 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gabbro_relief_pickaxe", + "id": "mineralogy:gabbro_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json index 07c0ae321..58329dfc6 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_plus", + "id": "mineralogy:gabbro_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json index 16dadcb6d..4e04de697 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:gabbro_relief_right", + "id": "mineralogy:gabbro_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json index adfa0707a..b8bbb7297 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gabbro_relief_sword", + "id": "mineralogy:gabbro_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json index 09f7edbc5..36a9a53d5 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_relief_vertical", + "id": "mineralogy:gabbro_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json index 1ac0ddd9c..0e380dead 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gabbro_slab", + "id": "mineralogy:gabbro_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json index 42e9a0af7..6318781ab 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:gabbro_smooth", + "id": "mineralogy:gabbro_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json index 8c9f42c08..5698dea10 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick", + "id": "mineralogy:gabbro_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json index ec0214829..5215fe954 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_furnace", + "id": "mineralogy:gabbro_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json index 9ee948f60..bcfddc932 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", + "id": "mineralogy:gabbro_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json index 3968ed5df..e4b869b50 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", + "id": "mineralogy:gabbro_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json index 45f012501..d0b41cb99 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", + "id": "mineralogy:gabbro_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json index b716daee8..d4ac204b3 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_furnace", + "id": "mineralogy:gabbro_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json index 1ee2b6167..f33f1513e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_slab", + "id": "mineralogy:gabbro_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json index f88f3bf54..bdf1b60cb 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_stairs", + "id": "mineralogy:gabbro_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json index a13221424..024c3738e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gabbro_smooth_wall", + "id": "mineralogy:gabbro_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json index b70918c30..ca7381f82 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gabbro_stairs", + "id": "mineralogy:gabbro_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_to_stone.json b/src/main/resources/data/mineralogy/recipes/gabbro_to_stone.json index 55378c78a..2d626eba8 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:gabbro" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json index 0ac8de638..2e3f261f9 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gabbro_wall", + "id": "mineralogy:gabbro_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json index bd125beb0..c4c1ac671 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick", + "id": "mineralogy:gneiss_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json index ae3ac9b77..2ec1dce84 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_brick", + "id": "mineralogy:gneiss_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json index e003b0630..fa70c2a74 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick_furnace", + "id": "mineralogy:gneiss_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json index 4ea79ba73..4e8cc9bd4 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick_slab", + "id": "mineralogy:gneiss_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json index 0d2027c28..12537e01f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", + "id": "mineralogy:gneiss_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json index 7204735fa..ee4adf068 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_brick", + "id": "mineralogy:gneiss_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json index c850bcaf9..90136253b 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick_stairs", + "id": "mineralogy:gneiss_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json index aa78e9272..bb14d13d3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", + "id": "mineralogy:gneiss_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json index 1ecdd9801..3066d8066 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick_wall", + "id": "mineralogy:gneiss_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json index c2698d7c3..a30322ee3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", + "id": "mineralogy:gneiss_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json index ea71b0ddd..bfebf58e8 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json index 94294f31b..1ab5554eb 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gneiss_furnace", + "id": "mineralogy:gneiss_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json index 00a52f916..3db5ec1c7 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_brick", + "id": "mineralogy:gneiss_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json index a069663d6..96f836df1 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth", + "id": "mineralogy:gneiss_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json index ec7139320..9788e424b 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", + "id": "mineralogy:gneiss_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json index 5da026ff9..496c0e7ee 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", + "id": "mineralogy:gneiss_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json index b4916dc22..4cdd4e21e 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", + "id": "mineralogy:gneiss_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json index eb015de39..716a09261 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_slab", + "id": "mineralogy:gneiss_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json index bed640ff6..bace4beaa 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss", + "id": "mineralogy:gneiss", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json index 3e9dfedbf..e8e76ec7e 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick_slab", + "id": "mineralogy:gneiss_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json index a7f893962..f8b72a9de 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_stairs", + "id": "mineralogy:gneiss_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json index a2a3f2124..5e25779b8 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick_stairs", + "id": "mineralogy:gneiss_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json index 372151716..0fb07d67a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth_wall", + "id": "mineralogy:gneiss_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json index faf730ea5..06c980b64 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:gneiss_brick_wall", + "id": "mineralogy:gneiss_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json index 7176fc56d..c648ed625 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gneiss_relief_axe", + "id": "mineralogy:gneiss_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json index 1a7c8643b..eb2bc2394 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_blank", + "id": "mineralogy:gneiss_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json index d29c096ec..982a272e1 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_cross", + "id": "mineralogy:gneiss_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json index 56b7cb8d0..2e99bbe67 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_hammer", + "id": "mineralogy:gneiss_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json index 2d151462f..d0a607a59 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gneiss_relief_hoe", + "id": "mineralogy:gneiss_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json index a6a44d5bf..cfc28a53f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_horizontal", + "id": "mineralogy:gneiss_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json index 274344ed8..b36e3706c 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_i", + "id": "mineralogy:gneiss_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json index 9ab2e22ac..281671d24 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_left", + "id": "mineralogy:gneiss_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json index fd19f2282..b248cd7bb 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gneiss_relief_pickaxe", + "id": "mineralogy:gneiss_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json index 71e95d59f..2fa7e596a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_plus", + "id": "mineralogy:gneiss_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json index 8c3618db3..6a0f6ef92 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:gneiss_relief_right", + "id": "mineralogy:gneiss_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json index ef8d06d0a..9fd7e9f76 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:gneiss_relief_sword", + "id": "mineralogy:gneiss_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json index 91717c662..412e154f7 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_relief_vertical", + "id": "mineralogy:gneiss_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json index 6ab02e722..5b00e722a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gneiss_slab", + "id": "mineralogy:gneiss_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json index a7b585d02..dbc5cc13a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:gneiss_smooth", + "id": "mineralogy:gneiss_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json index d99f238ac..c87981505 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick", + "id": "mineralogy:gneiss_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json index da6cd5a64..04de30128 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_furnace", + "id": "mineralogy:gneiss_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json index 5875ae6b9..aed5aca86 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", + "id": "mineralogy:gneiss_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json index 663d1fb10..2df73783f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", + "id": "mineralogy:gneiss_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json index 24f57278f..75c94ed6b 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", + "id": "mineralogy:gneiss_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json index 619663c5a..1cda8bd4f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_furnace", + "id": "mineralogy:gneiss_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json index 709918c39..ca0141a00 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_slab", + "id": "mineralogy:gneiss_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json index f8c70fbd8..5f783ef39 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_stairs", + "id": "mineralogy:gneiss_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json index 498f9e93f..950772d13 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gneiss_smooth_wall", + "id": "mineralogy:gneiss_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json index 2989f8f66..7cf258cff 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:gneiss_stairs", + "id": "mineralogy:gneiss_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_to_stone.json b/src/main/resources/data/mineralogy/recipes/gneiss_to_stone.json index e61be14a4..016278bf8 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:gneiss" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json index d23e82c02..c43d17c92 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gneiss_wall", + "id": "mineralogy:gneiss_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick.json b/src/main/resources/data/mineralogy/recipes/granite_brick.json index 613315291..0b77f889b 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:granite_brick", + "id": "mineralogy:granite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json index f74bfea08..e2820b64e 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_brick", + "id": "mineralogy:granite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json index 6fc81fed1..f1382fc3c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:granite_brick_furnace", + "id": "mineralogy:granite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json index 80caad809..d55a13cfb 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:granite_brick_slab", + "id": "mineralogy:granite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json index feaf82172..e7d314736 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_brick_slab", + "id": "mineralogy:granite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json index b1390b015..8f3c884a8 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_brick", + "id": "mineralogy:granite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json index 0d0cd6232..57d8c0bf7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_brick_stairs", + "id": "mineralogy:granite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json index e1c94b500..08a12f15c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_brick_stairs", + "id": "mineralogy:granite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json index 6caa0d8db..6eaae9b28 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:granite_brick_wall", + "id": "mineralogy:granite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json index 1cfbf7142..68ccbd675 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_brick_wall", + "id": "mineralogy:granite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json index 35427cd94..547dea8f1 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_furnace.json index c0753534b..d80b317f5 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:granite_furnace", + "id": "mineralogy:granite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json index 78ddb6006..521fa592a 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_brick", + "id": "mineralogy:granite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json index 21d87e3d4..da0a6e7ce 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth", + "id": "mineralogy:granite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json index 0ea6bb3ae..4c76de176 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick_slab", + "id": "mineralogy:granite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json index 73f040dc7..bbc60b5d9 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick_stairs", + "id": "mineralogy:granite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json index ee33b2956..f56351dde 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick_wall", + "id": "mineralogy:granite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json index 96ed588ef..031714aed 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_slab", + "id": "mineralogy:granite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json index 0a94e27b8..3fb70b28a 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite", + "id": "mineralogy:granite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json index c17ed2b6f..b8f967dff 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:granite_brick_slab", + "id": "mineralogy:granite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json index c1c0daed5..44b853ed8 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_stairs", + "id": "mineralogy:granite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json index 718933dc1..f9b44de7c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:granite_brick_stairs", + "id": "mineralogy:granite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json index d475e6495..27b2c8166 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_wall", + "id": "mineralogy:granite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json index f0c139f53..afb57a42f 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:granite_brick_wall", + "id": "mineralogy:granite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json index a52b52d26..63a67b16b 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:granite_relief_axe", + "id": "mineralogy:granite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json index 2d2a163c8..c3ef121e6 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_blank", + "id": "mineralogy:granite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json index 18a03f3e4..c4504d65d 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_cross", + "id": "mineralogy:granite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json index 7050da6c6..c3c4f427c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_hammer", + "id": "mineralogy:granite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json index 6e18a29ac..c8adda028 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:granite_relief_hoe", + "id": "mineralogy:granite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json index f952c1055..4c0e29d90 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_horizontal", + "id": "mineralogy:granite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_i.json b/src/main/resources/data/mineralogy/recipes/granite_relief_i.json index 10dec09c0..b4cf175f8 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_i", + "id": "mineralogy:granite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_left.json b/src/main/resources/data/mineralogy/recipes/granite_relief_left.json index acb88d8c1..c3c1d309d 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_left", + "id": "mineralogy:granite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json index d4320505a..2072b65ec 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:granite_relief_pickaxe", + "id": "mineralogy:granite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json index c43b0f32d..b4fedc847 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_plus", + "id": "mineralogy:granite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_right.json b/src/main/resources/data/mineralogy/recipes/granite_relief_right.json index 401ac1ac8..9657db86f 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:granite_relief_right", + "id": "mineralogy:granite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json index e656c43f0..256a75c96 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:granite_relief_sword", + "id": "mineralogy:granite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json index 642818d2a..b13834ef0 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_relief_vertical", + "id": "mineralogy:granite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab.json b/src/main/resources/data/mineralogy/recipes/granite_slab.json index 1e992e7e7..c5e9b3f15 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:granite_slab", + "id": "mineralogy:granite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json index 928eaf417..44c95a0b8 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:granite_slab", + "id": "mineralogy:granite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json index 2ba7433a9..4dda2b953 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "minecraft:granite_slab", + "id": "minecraft:granite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/recipes/granite_smooth.json index 985459157..4d8c64ab9 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth", + "id": "mineralogy:granite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json index 81e888e27..7e82d1735 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick", + "id": "mineralogy:granite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json index 45088810b..9597de82b 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick_furnace", + "id": "mineralogy:granite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json index d5c870a16..ada30ba97 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick_slab", + "id": "mineralogy:granite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json index 58cc584a8..3a9414aa4 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick_stairs", + "id": "mineralogy:granite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json index 703ab4f9d..411b43880 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_brick_wall", + "id": "mineralogy:granite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json index d2e6c39be..f1b9994ff 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_furnace", + "id": "mineralogy:granite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json index 1052a6b81..265388cbc 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_slab", + "id": "mineralogy:granite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json index 4328107de..abb25d0e2 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:granite_smooth_slab", + "id": "mineralogy:granite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json index 09f294851..4328e7ee2 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "minecraft:polished_granite_slab", + "id": "minecraft:polished_granite_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json index 362d5e2af..f3b6b1ada 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_stairs", + "id": "mineralogy:granite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json index 2257bd805..6bba53690 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:granite_smooth_wall", + "id": "mineralogy:granite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_stairs.json index 3e00959e9..29647192f 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:granite_stairs", + "id": "mineralogy:granite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/granite_to_stone.json b/src/main/resources/data/mineralogy/recipes/granite_to_stone.json index 7d48dc1d0..87d9e2b33 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/granite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:granite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall.json b/src/main/resources/data/mineralogy/recipes/granite_wall.json index 40783294a..fd3e0e0fd 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:granite_wall", + "id": "mineralogy:granite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json b/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json index 12aad4fd1..35a80d0f7 100644 --- a/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "minecraft:gravel" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200, "conditions": [ diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json index 6d08333fa..12eb95cd2 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json @@ -1,17 +1,20 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/carbon" - } - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/carbon" + } + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ @@ -26,7 +29,7 @@ } ], "result": { - "item": "minecraft:gunpowder", + "id": "minecraft:gunpowder", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json index ff066dbee..67e2d062c 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ @@ -19,7 +17,7 @@ } ], "result": { - "item": "minecraft:gunpowder", + "id": "minecraft:gunpowder", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json index ca4330a75..2067ba1c3 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json @@ -1,17 +1,20 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/coal" - } - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ @@ -26,7 +29,7 @@ } ], "result": { - "item": "minecraft:gunpowder", + "id": "minecraft:gunpowder", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json index adee0187a..c00185517 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], + "forge:condition": { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ @@ -19,7 +17,7 @@ } ], "result": { - "item": "minecraft:gunpowder", + "id": "minecraft:gunpowder", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/gypsum.json b/src/main/resources/data/mineralogy/recipes/gypsum.json index a96b96ca6..7968337c9 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:gypsum", + "id": "mineralogy:gypsum", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json index 3609a7dda..4978ed9ff 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum_dust" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -13,7 +11,7 @@ } ], "result": { - "item": "mineralogy:gypsum_dust", + "id": "mineralogy:gypsum_dust", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json index eff463250..1799eaa44 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick", + "id": "mineralogy:hornfels_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json index a48434b90..939238cac 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_brick", + "id": "mineralogy:hornfels_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json index 1064cc249..21408901a 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick_furnace", + "id": "mineralogy:hornfels_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json index f3c5892ee..4bebf7b9a 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick_slab", + "id": "mineralogy:hornfels_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json index b6b4733be..da3bbaa26 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", + "id": "mineralogy:hornfels_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json index 486164944..ab7af980a 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_brick", + "id": "mineralogy:hornfels_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json index 362c1facd..f0d26d3d1 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick_stairs", + "id": "mineralogy:hornfels_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json index 229f60b8d..ea4fddc53 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", + "id": "mineralogy:hornfels_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json index 41b79a9d2..5e68a5e44 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick_wall", + "id": "mineralogy:hornfels_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json index 8deaca95b..0618c2b7d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", + "id": "mineralogy:hornfels_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json index d915aff4f..34c5214e7 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json index 28d5c1e3c..ff3d488b8 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:hornfels_furnace", + "id": "mineralogy:hornfels_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json index f749cb883..dd2b9c9c2 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_brick", + "id": "mineralogy:hornfels_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json index 1f796bec1..af4cae66d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth", + "id": "mineralogy:hornfels_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json index 635eaf1e1..d631799ba 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", + "id": "mineralogy:hornfels_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json index c88fdb224..6e94b6edd 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", + "id": "mineralogy:hornfels_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json index e2ecddbce..b8f622c76 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", + "id": "mineralogy:hornfels_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json index 7448daf91..4e002bcb0 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_slab", + "id": "mineralogy:hornfels_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json index 12abdb2de..244a4e12a 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels", + "id": "mineralogy:hornfels", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json index 19d553f5f..a42a7d7a7 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick_slab", + "id": "mineralogy:hornfels_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json index e2d62f621..fc6879674 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_stairs", + "id": "mineralogy:hornfels_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json index 3b648d102..8a5e363c8 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick_stairs", + "id": "mineralogy:hornfels_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json index 57bb6eb40..fa9a97f01 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth_wall", + "id": "mineralogy:hornfels_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json index c52654d71..b1512c725 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:hornfels_brick_wall", + "id": "mineralogy:hornfels_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json index a3212f601..5692e679a 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:hornfels_relief_axe", + "id": "mineralogy:hornfels_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json index a51129af1..319b0f6c4 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_blank", + "id": "mineralogy:hornfels_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json index dbd37d1e5..037ed708b 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_cross", + "id": "mineralogy:hornfels_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json index 4c81575bf..ae28e3926 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_hammer", + "id": "mineralogy:hornfels_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json index 2cd3683f0..f26b2e6ed 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:hornfels_relief_hoe", + "id": "mineralogy:hornfels_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json index 85653505d..a9b309d62 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_horizontal", + "id": "mineralogy:hornfels_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json index 374ac105e..37040e7e1 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_i", + "id": "mineralogy:hornfels_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json index f59c56563..3c643eccd 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_left", + "id": "mineralogy:hornfels_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json index 4b1674db3..207019253 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:hornfels_relief_pickaxe", + "id": "mineralogy:hornfels_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json index d8bee7abd..d60a38109 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_plus", + "id": "mineralogy:hornfels_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json index 997f767ff..73f73871c 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:hornfels_relief_right", + "id": "mineralogy:hornfels_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json index 5b201f381..436df64db 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:hornfels_relief_sword", + "id": "mineralogy:hornfels_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json index 9f1addf4e..5d5067ecb 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_relief_vertical", + "id": "mineralogy:hornfels_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json index 2f21d5979..468844a7f 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:hornfels_slab", + "id": "mineralogy:hornfels_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json index 3a59cd1fb..4ec59cd5e 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:hornfels_smooth", + "id": "mineralogy:hornfels_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json index 62e95fe36..18c274b5f 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick", + "id": "mineralogy:hornfels_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json index e53e77ed5..cdb35bc84 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_furnace", + "id": "mineralogy:hornfels_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json index 4fc9c6c38..f7e6fb4f7 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", + "id": "mineralogy:hornfels_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json index b986eb093..50616d2d4 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", + "id": "mineralogy:hornfels_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json index ff5184b48..9d68a8ee3 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", + "id": "mineralogy:hornfels_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json index 75f7df166..207802b9b 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_furnace", + "id": "mineralogy:hornfels_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json index 370fbadef..8dcd01db0 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_slab", + "id": "mineralogy:hornfels_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json index 16ddae617..a64336e53 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_stairs", + "id": "mineralogy:hornfels_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json index eb1e42ec1..efd7de7db 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:hornfels_smooth_wall", + "id": "mineralogy:hornfels_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json index 6f98296f4..9804f067b 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:hornfels_stairs", + "id": "mineralogy:hornfels_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_to_stone.json b/src/main/resources/data/mineralogy/recipes/hornfels_to_stone.json index 28c68059c..a8e3f107b 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:hornfels" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json index f2a15ae22..f99e579d3 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:hornfels_wall", + "id": "mineralogy:hornfels_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_brick.json index 3f0843e81..a7679ba3b 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick", + "id": "mineralogy:limestone_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json index 6938d4a0e..61e39ad9e 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_brick", + "id": "mineralogy:limestone_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json index 1b286e57d..f64681294 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick_furnace", + "id": "mineralogy:limestone_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json index 5f4091164..535b53d06 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick_slab", + "id": "mineralogy:limestone_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json index abd9d4cb6..2c310f7fa 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_brick_slab", + "id": "mineralogy:limestone_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json index f582147f1..2461f6421 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_brick", + "id": "mineralogy:limestone_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json index dd8f140a2..2a3d1cc0a 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick_stairs", + "id": "mineralogy:limestone_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json index b7c46ba10..00e17c094 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", + "id": "mineralogy:limestone_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json index 9d119286e..53633b9fe 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick_wall", + "id": "mineralogy:limestone_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json index 2f36652b1..75acf54c8 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_brick_wall", + "id": "mineralogy:limestone_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json index a08c41347..0f5516d47 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json index 7d3edfb17..941c740d3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:limestone_furnace", + "id": "mineralogy:limestone_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json index 2cb3b180a..1f422a153 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_brick", + "id": "mineralogy:limestone_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json index 51aa24954..fd523b8b6 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth", + "id": "mineralogy:limestone_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json index ceff47a00..133a3527f 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick_slab", + "id": "mineralogy:limestone_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json index a8c49dd5d..a4f95a8b9 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", + "id": "mineralogy:limestone_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json index d56d96f11..b89bdc58d 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick_wall", + "id": "mineralogy:limestone_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json index 9620cd661..15272e866 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_slab", + "id": "mineralogy:limestone_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json index 91c324937..76ba62fc7 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone", + "id": "mineralogy:limestone", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json index 02900a4ca..a48101b20 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick_slab", + "id": "mineralogy:limestone_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json index b47d66f5e..7935779c3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_stairs", + "id": "mineralogy:limestone_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json index 55bd83a8f..807997de2 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick_stairs", + "id": "mineralogy:limestone_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json index 55e46f722..6e12acdeb 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth_wall", + "id": "mineralogy:limestone_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json index 994b2fd60..24a0865cb 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:limestone_brick_wall", + "id": "mineralogy:limestone_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json index 248d32c8d..38d32fb4c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:limestone_relief_axe", + "id": "mineralogy:limestone_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json index be8f9c58f..309011353 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_blank", + "id": "mineralogy:limestone_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json index c6399a8a3..dace5fe74 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_cross", + "id": "mineralogy:limestone_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json index afdc37b08..c843d1363 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_hammer", + "id": "mineralogy:limestone_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json index 1fc5dd9f0..c9e684441 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:limestone_relief_hoe", + "id": "mineralogy:limestone_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json index bc81b5e6f..f8d32c6b2 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_horizontal", + "id": "mineralogy:limestone_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json index 48f84e42b..29ca873a0 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_i", + "id": "mineralogy:limestone_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json index 1b1e4e221..d8876686b 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_left", + "id": "mineralogy:limestone_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json index e94e88ff6..a9c907a38 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:limestone_relief_pickaxe", + "id": "mineralogy:limestone_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json index 2167093e7..d3f68853d 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_plus", + "id": "mineralogy:limestone_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json index eedb25009..e90bbf9cb 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:limestone_relief_right", + "id": "mineralogy:limestone_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json index d76512ed0..315dc43b7 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:limestone_relief_sword", + "id": "mineralogy:limestone_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json index 2841ae36c..45b99e6e8 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_relief_vertical", + "id": "mineralogy:limestone_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_slab.json index f47f1bd59..299178407 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:limestone_slab", + "id": "mineralogy:limestone_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json index d8bdb6cdb..8d0f23fc2 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:limestone_smooth", + "id": "mineralogy:limestone_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json index 04a0bd9da..55e2c74c2 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick", + "id": "mineralogy:limestone_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json index b3539cb39..030941cfc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick_furnace", + "id": "mineralogy:limestone_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json index 160056974..9de2111c1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick_slab", + "id": "mineralogy:limestone_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json index 50136e20f..f16215c80 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", + "id": "mineralogy:limestone_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json index c05377eec..a4260fbb1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_brick_wall", + "id": "mineralogy:limestone_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json index f30d056e4..00399a100 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_furnace", + "id": "mineralogy:limestone_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json index b3b131973..b734c2e3b 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_slab", + "id": "mineralogy:limestone_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json index 0f48c6702..672b09661 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_stairs", + "id": "mineralogy:limestone_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json index b2c7c9d16..1b8c97cd1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:limestone_smooth_wall", + "id": "mineralogy:limestone_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json index 3f5423f93..21fb734d0 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:limestone_stairs", + "id": "mineralogy:limestone_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/limestone_to_stone.json b/src/main/resources/data/mineralogy/recipes/limestone_to_stone.json index db386d5d8..8d90c8671 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:limestone" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_wall.json index 2b4768beb..53e488b4c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:limestone_wall", + "id": "mineralogy:limestone_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick.json b/src/main/resources/data/mineralogy/recipes/marble_brick.json index 2027997f4..d51b21252 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:marble_brick", + "id": "mineralogy:marble_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json index 2a581a9f1..cd1e3dc5b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_brick", + "id": "mineralogy:marble_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json index 00440172b..8b0f7982a 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:marble_brick_furnace", + "id": "mineralogy:marble_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json index a6519510b..41da5670d 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:marble_brick_slab", + "id": "mineralogy:marble_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json index d1cde5f23..192739d68 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_brick_slab", + "id": "mineralogy:marble_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json index fefd8b612..96c38deb0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_brick", + "id": "mineralogy:marble_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json index f6f7fbef0..e5f591538 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_brick_stairs", + "id": "mineralogy:marble_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json index 916163dec..959554130 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_brick_stairs", + "id": "mineralogy:marble_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json b/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json index 4201bac42..3c8f94e59 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:marble_brick_wall", + "id": "mineralogy:marble_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json index 0702691cb..994a3e4db 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_brick_wall", + "id": "mineralogy:marble_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json index 3023e11a4..ca278e01f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_furnace.json index 613448fbc..ce6ec8470 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:marble_furnace", + "id": "mineralogy:marble_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json index 0873cbfc1..64dcc8a87 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_brick", + "id": "mineralogy:marble_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json index bc8e68f13..bd5ea097e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth", + "id": "mineralogy:marble_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json index e00c86ea6..bbdfc770a 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick_slab", + "id": "mineralogy:marble_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json index eba5b55bd..7fb491574 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick_stairs", + "id": "mineralogy:marble_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json index d2ae7bf76..b37486d17 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick_wall", + "id": "mineralogy:marble_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json index e4471d066..54f106db0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_slab", + "id": "mineralogy:marble_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json index 7b3d5b211..478a8cf33 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble", + "id": "mineralogy:marble", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json index b68af4a29..2fe65925f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:marble_brick_slab", + "id": "mineralogy:marble_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json index fff01b0d4..194463a9e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_stairs", + "id": "mineralogy:marble_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json index 2f32811f8..95fc793b0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:marble_brick_stairs", + "id": "mineralogy:marble_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json index 2753c9c88..5704481fa 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth_wall", + "id": "mineralogy:marble_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json index e95291343..82edc2e0b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:marble_brick_wall", + "id": "mineralogy:marble_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json index 64d1243d7..5aa5966c7 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:marble_relief_axe", + "id": "mineralogy:marble_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json b/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json index 589d9d5a6..cddb3c3a6 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_blank", + "id": "mineralogy:marble_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json b/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json index 041d7bb1f..f24c97919 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_cross", + "id": "mineralogy:marble_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json index 2fc8e596a..d07b8b5e1 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_hammer", + "id": "mineralogy:marble_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json index 1a09b94ed..0b7a7801f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:marble_relief_hoe", + "id": "mineralogy:marble_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json index 2174681ce..005a60280 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_horizontal", + "id": "mineralogy:marble_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_i.json b/src/main/resources/data/mineralogy/recipes/marble_relief_i.json index ca81d9f86..f5a908245 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_i", + "id": "mineralogy:marble_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_left.json b/src/main/resources/data/mineralogy/recipes/marble_relief_left.json index ea1c490eb..9df398791 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_left", + "id": "mineralogy:marble_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json index 8f925e7b9..75c538d1e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:marble_relief_pickaxe", + "id": "mineralogy:marble_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json b/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json index 787a4e397..43ea1cc65 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_plus", + "id": "mineralogy:marble_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_right.json b/src/main/resources/data/mineralogy/recipes/marble_relief_right.json index 50ea9693d..fa89a7c17 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:marble_relief_right", + "id": "mineralogy:marble_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json b/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json index c966006a3..f239c0f54 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:marble_relief_sword", + "id": "mineralogy:marble_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json index e7f920469..087495c79 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_relief_vertical", + "id": "mineralogy:marble_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_slab.json b/src/main/resources/data/mineralogy/recipes/marble_slab.json index 3baf7d9dc..d0e9aade1 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:marble_slab", + "id": "mineralogy:marble_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/recipes/marble_smooth.json index 1b6572370..49185d548 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:marble_smooth", + "id": "mineralogy:marble_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json index 1ce7d9377..2a8eb640c 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick", + "id": "mineralogy:marble_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json index abfc4e6e9..4c026b943 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick_furnace", + "id": "mineralogy:marble_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json index 52204f31b..0884cef30 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick_slab", + "id": "mineralogy:marble_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json index 9dbfb29e1..2a95a50a5 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick_stairs", + "id": "mineralogy:marble_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json index cdad1bd21..72bf037f0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_brick_wall", + "id": "mineralogy:marble_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json index 96ad5cee7..1c809e9a3 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_furnace", + "id": "mineralogy:marble_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json index 51f5086e9..a7413a3e5 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_slab", + "id": "mineralogy:marble_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json index ea59eeb0e..c6c2ce78c 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_stairs", + "id": "mineralogy:marble_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json index d8edeedab..9a1dbfae0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:marble_smooth_wall", + "id": "mineralogy:marble_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_stairs.json index 8d21c58b3..d23947a94 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:marble_stairs", + "id": "mineralogy:marble_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/marble_to_stone.json b/src/main/resources/data/mineralogy/recipes/marble_to_stone.json index 2d50fcb9a..bb7194c41 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/marble_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:marble" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/marble_wall.json b/src/main/resources/data/mineralogy/recipes/marble_wall.json index 8f2d33426..12a72703a 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:marble_wall", + "id": "mineralogy:marble_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json index fc8763398..3efe81ea6 100644 --- a/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json +++ b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_FERTILIZER" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:mineral_fertilizer" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:mineral_fertilizer", + "id": "mineralogy:mineral_fertilizer", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/nitrate_block.json b/src/main/resources/data/mineralogy/recipes/nitrate_block.json index 352b71546..6c8149269 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_block.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_block.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_block" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -22,7 +25,7 @@ } }, "result": { - "item": "mineralogy:nitrate_block", + "id": "mineralogy:nitrate_block", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json index 342017c9a..959f1dabb 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_dust" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:nitrate_dust", + "id": "mineralogy:nitrate_dust", "count": 9 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json index cc0c70404..adf9be6a7 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick", + "id": "mineralogy:novaculite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json index 7f38e184d..ba4c56bb1 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_brick", + "id": "mineralogy:novaculite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json index d67800410..c9770bb46 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick_furnace", + "id": "mineralogy:novaculite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json index c60f277fd..31ced809d 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick_slab", + "id": "mineralogy:novaculite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json index 108d33267..a53787a36 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", + "id": "mineralogy:novaculite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json index 38c092cf9..9d9db0f3e 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_brick", + "id": "mineralogy:novaculite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json index 9560983ae..c1ba35d28 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick_stairs", + "id": "mineralogy:novaculite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json index 2a8d371e7..7aeef94db 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", + "id": "mineralogy:novaculite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json index 5eb40b547..8d65370f3 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick_wall", + "id": "mineralogy:novaculite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json index 62b4ec368..58ad77401 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", + "id": "mineralogy:novaculite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json index e8236b88a..c80c0f5d9 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json index 9025e71b8..b30d0c61e 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:novaculite_furnace", + "id": "mineralogy:novaculite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json index 3b55fbca5..6c2b4ccab 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_brick", + "id": "mineralogy:novaculite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json index 80e6f87be..59639fd40 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth", + "id": "mineralogy:novaculite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json index 7a9602795..a649989e8 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", + "id": "mineralogy:novaculite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json index 04602485a..39cdcc990 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", + "id": "mineralogy:novaculite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json index e0131b082..d2befe59b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", + "id": "mineralogy:novaculite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json index ca6d5ae35..ca4bcf9c2 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_slab", + "id": "mineralogy:novaculite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json index 639248ef8..504d8e60f 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite", + "id": "mineralogy:novaculite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json index c1577aeab..b47dc2550 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick_slab", + "id": "mineralogy:novaculite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json index 4091cfa83..875a41111 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_stairs", + "id": "mineralogy:novaculite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json index 41b3cb713..495b635f0 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick_stairs", + "id": "mineralogy:novaculite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json index cbe8e8206..ce749cf28 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth_wall", + "id": "mineralogy:novaculite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json index 36efa0e38..5843103d3 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:novaculite_brick_wall", + "id": "mineralogy:novaculite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json index 8f342df6a..d4c2aed2c 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:novaculite_relief_axe", + "id": "mineralogy:novaculite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json index 7e992b90e..1430807fd 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_blank", + "id": "mineralogy:novaculite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json index f8094fedb..8702c8386 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_cross", + "id": "mineralogy:novaculite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json index f2782569f..b04a06414 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_hammer", + "id": "mineralogy:novaculite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json index d1a6fb42b..50bc8a4c2 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:novaculite_relief_hoe", + "id": "mineralogy:novaculite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json index d0b665408..5d142ef81 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_horizontal", + "id": "mineralogy:novaculite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json index c4c657769..f691871ac 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_i", + "id": "mineralogy:novaculite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json index 988f01724..21ac95928 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_left", + "id": "mineralogy:novaculite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json index 8762b5ca3..1a556de30 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:novaculite_relief_pickaxe", + "id": "mineralogy:novaculite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json index 6b9a52ff5..61ad15c3c 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_plus", + "id": "mineralogy:novaculite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json index c85e9e81b..5525a9062 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:novaculite_relief_right", + "id": "mineralogy:novaculite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json index 65a118323..77ff08d02 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:novaculite_relief_sword", + "id": "mineralogy:novaculite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json index d4c882522..2c5a64dd6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_relief_vertical", + "id": "mineralogy:novaculite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json index 2ba86efbc..5b6604322 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:novaculite_slab", + "id": "mineralogy:novaculite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json index 06a01fe17..51dfe5aca 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:novaculite_smooth", + "id": "mineralogy:novaculite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json index 6f40581e0..ef60964ba 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick", + "id": "mineralogy:novaculite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json index 9cbc3d4e1..9a56b2727 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_furnace", + "id": "mineralogy:novaculite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json index 8ac3cb34d..32fc74c15 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", + "id": "mineralogy:novaculite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json index 6cf93c248..59bffeaf4 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", + "id": "mineralogy:novaculite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json index f1417fd34..016bbf789 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", + "id": "mineralogy:novaculite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json index 2e9903dc1..2fc4229f6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_furnace", + "id": "mineralogy:novaculite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json index b023a315e..4d5d9109c 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_slab", + "id": "mineralogy:novaculite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json index 3b123395e..837890658 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_stairs", + "id": "mineralogy:novaculite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json index df28be283..9b048fa85 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:novaculite_smooth_wall", + "id": "mineralogy:novaculite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json index e2f7c0b6d..45fad7baf 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:novaculite_stairs", + "id": "mineralogy:novaculite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_to_stone.json b/src/main/resources/data/mineralogy/recipes/novaculite_to_stone.json index c47f85d55..f80e9d4f5 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:novaculite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json index 0e81205ff..f1647e91a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:novaculite_wall", + "id": "mineralogy:novaculite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json index ddd866c6b..5c0e3c325 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick", + "id": "mineralogy:pegmatite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json index d78c99ee9..5a8bc1e58 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_brick", + "id": "mineralogy:pegmatite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json index 394766a65..4350a7a89 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick_furnace", + "id": "mineralogy:pegmatite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json index 94b8439d0..b3141afd9 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick_slab", + "id": "mineralogy:pegmatite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json index da7d9af02..bdf2c4101 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", + "id": "mineralogy:pegmatite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json index 9e3fcfef3..fdd1b0c1c 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_brick", + "id": "mineralogy:pegmatite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json index fa3f3691f..03944dc72 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick_stairs", + "id": "mineralogy:pegmatite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json index 20f41829b..249da77c7 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", + "id": "mineralogy:pegmatite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json index 6f896886c..2b1abf736 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick_wall", + "id": "mineralogy:pegmatite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json index 76d2164f1..2b9cb3fc7 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", + "id": "mineralogy:pegmatite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json index 86a807ec5..68bdd9015 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json index 3b64d774b..288822fab 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_furnace", + "id": "mineralogy:pegmatite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json index a9d0d580a..e65f4c222 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_brick", + "id": "mineralogy:pegmatite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json index 40fa548f8..fa2ec93e7 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth", + "id": "mineralogy:pegmatite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json index 1e8361668..a51fcf331 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", + "id": "mineralogy:pegmatite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json index 79c03451b..64b946d65 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", + "id": "mineralogy:pegmatite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json index 954569b0d..d76207a2c 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", + "id": "mineralogy:pegmatite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json index 80b6b5f05..dde520904 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_slab", + "id": "mineralogy:pegmatite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json index f3a62ebf0..fdf72166a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite", + "id": "mineralogy:pegmatite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json index 5b83fd62b..5e210ba09 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick_slab", + "id": "mineralogy:pegmatite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json index c129a5535..a7b1dbb73 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_stairs", + "id": "mineralogy:pegmatite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json index 4a8b77f55..40860817f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick_stairs", + "id": "mineralogy:pegmatite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json index 7808acc0d..b62729247 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth_wall", + "id": "mineralogy:pegmatite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json index c3c8227cb..08693890d 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_brick_wall", + "id": "mineralogy:pegmatite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json index 9f4e0b1ec..56e8c08de 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_relief_axe", + "id": "mineralogy:pegmatite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json index a1dc85dfd..370ba6109 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_blank", + "id": "mineralogy:pegmatite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json index e9f684cd0..e3dc24de5 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_cross", + "id": "mineralogy:pegmatite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json index 94ddc6d3a..b02f74ae7 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_hammer", + "id": "mineralogy:pegmatite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json index 179633d5c..2ee88425b 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_relief_hoe", + "id": "mineralogy:pegmatite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json index 145bcc3e6..c9dbd46ce 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_horizontal", + "id": "mineralogy:pegmatite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json index 9b99330f9..566273b8a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_i", + "id": "mineralogy:pegmatite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json index eaba5fc2b..795d44bf1 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_left", + "id": "mineralogy:pegmatite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json index b48cb62c3..d0a7d0016 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_relief_pickaxe", + "id": "mineralogy:pegmatite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json index c68160af5..8f404b915 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_plus", + "id": "mineralogy:pegmatite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json index bb548f0ce..41093d22d 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_relief_right", + "id": "mineralogy:pegmatite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json index c7a971e1a..2337ac637 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_relief_sword", + "id": "mineralogy:pegmatite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json index 887d0ca3c..42de3fb54 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_relief_vertical", + "id": "mineralogy:pegmatite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json index ea02b1db1..224cb4314 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_slab", + "id": "mineralogy:pegmatite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json index e57228eab..6edec72a0 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:pegmatite_smooth", + "id": "mineralogy:pegmatite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json index 89bff58fe..b166a8487 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick", + "id": "mineralogy:pegmatite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json index 4a586bddd..0d7daf46e 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_furnace", + "id": "mineralogy:pegmatite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json index bd3b8ff52..1dc175c04 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", + "id": "mineralogy:pegmatite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json index 6f0fba3e6..6f837310a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", + "id": "mineralogy:pegmatite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json index bc5820eb9..0888c5873 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", + "id": "mineralogy:pegmatite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json index 4e37c34cd..8611c1f1b 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_furnace", + "id": "mineralogy:pegmatite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json index 98c243445..9ede5ca4c 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_slab", + "id": "mineralogy:pegmatite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json index 039f91a31..d8219455c 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_stairs", + "id": "mineralogy:pegmatite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json index b1b119559..6b1f09410 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_smooth_wall", + "id": "mineralogy:pegmatite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json index 14b0ae0cf..66fd73170 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_stairs", + "id": "mineralogy:pegmatite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_to_stone.json b/src/main/resources/data/mineralogy/recipes/pegmatite_to_stone.json index 0e3cec905..6e9caad0f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:pegmatite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json index 45e5b5179..a119c533a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:pegmatite_wall", + "id": "mineralogy:pegmatite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json index 788c236e3..579ee5ea6 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick", + "id": "mineralogy:peridotite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json index d923132c0..d27b88e8c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_brick", + "id": "mineralogy:peridotite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json index 33234ca16..c8d5af888 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick_furnace", + "id": "mineralogy:peridotite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json index ed874142a..f7c0dad87 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick_slab", + "id": "mineralogy:peridotite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json index 17668ecb7..9b1ccd3ed 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", + "id": "mineralogy:peridotite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json index 0943beedb..086dcf83f 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_brick", + "id": "mineralogy:peridotite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json index f916a0673..ddc23d82f 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick_stairs", + "id": "mineralogy:peridotite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json index 211a22274..b2b17058b 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", + "id": "mineralogy:peridotite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json index 36648bef9..ee2289a3a 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick_wall", + "id": "mineralogy:peridotite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json index 33fd4aec9..16af5e29d 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", + "id": "mineralogy:peridotite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json index da7c6dcb8..59cceb0b4 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json index 238142c09..d80acb508 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:peridotite_furnace", + "id": "mineralogy:peridotite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json index c01000fbe..46a0ea337 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_brick", + "id": "mineralogy:peridotite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json index 35a947649..cfdfb962f 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth", + "id": "mineralogy:peridotite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json index fcfc1a13e..e55ba1587 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", + "id": "mineralogy:peridotite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json index e08247cd1..d85661cc1 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", + "id": "mineralogy:peridotite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json index 8e167e013..dda262e50 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", + "id": "mineralogy:peridotite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json index 98ea26278..697ac484d 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_slab", + "id": "mineralogy:peridotite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json index daaf5f003..896348488 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite", + "id": "mineralogy:peridotite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json index 13414e57a..cc020351f 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick_slab", + "id": "mineralogy:peridotite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json index 50e5b41be..6628bf3ef 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_stairs", + "id": "mineralogy:peridotite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json index 16705aab6..6baca04ec 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick_stairs", + "id": "mineralogy:peridotite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json index 7a5863d01..6a8de6275 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth_wall", + "id": "mineralogy:peridotite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json index 369139281..e1952d174 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:peridotite_brick_wall", + "id": "mineralogy:peridotite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json index ca2563179..d691ddadf 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:peridotite_relief_axe", + "id": "mineralogy:peridotite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json index d39f52226..c99f2c344 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_blank", + "id": "mineralogy:peridotite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json index 1f377518f..4eef52a9e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_cross", + "id": "mineralogy:peridotite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json index eaf4fb93c..3895f6d70 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_hammer", + "id": "mineralogy:peridotite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json index 5cabaca3b..900c628e2 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:peridotite_relief_hoe", + "id": "mineralogy:peridotite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json index 376cf14a0..6f45d9cd3 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_horizontal", + "id": "mineralogy:peridotite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json index f6a152ead..5f02af79a 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_i", + "id": "mineralogy:peridotite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json index 66f91a23f..247eb3367 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_left", + "id": "mineralogy:peridotite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json index bf81d09cc..a9108229b 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:peridotite_relief_pickaxe", + "id": "mineralogy:peridotite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json index 1382231fd..0daeb2e60 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_plus", + "id": "mineralogy:peridotite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json index e45669696..56561c998 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:peridotite_relief_right", + "id": "mineralogy:peridotite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json index 652ea8439..a7b887cc2 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:peridotite_relief_sword", + "id": "mineralogy:peridotite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json index 8671b5797..3f6869826 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_relief_vertical", + "id": "mineralogy:peridotite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json index 34cc6fda1..9d058d7f1 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:peridotite_slab", + "id": "mineralogy:peridotite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json index 0550450a3..81a5e0da4 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:peridotite_smooth", + "id": "mineralogy:peridotite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json index d69158a91..5e5001c89 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick", + "id": "mineralogy:peridotite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json index 7c868960a..8b3b70873 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_furnace", + "id": "mineralogy:peridotite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json index eb9a17ac7..db4b8098f 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", + "id": "mineralogy:peridotite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json index 4083c0c7d..15e02abe3 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", + "id": "mineralogy:peridotite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json index 773f11832..aa536bcac 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", + "id": "mineralogy:peridotite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json index d5b2a6b8c..ea246cbde 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_furnace", + "id": "mineralogy:peridotite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json index 7ab69f929..f89892887 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_slab", + "id": "mineralogy:peridotite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json index 0be075026..3118e7bac 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_stairs", + "id": "mineralogy:peridotite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json index f6e337b6c..48c7baa0d 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:peridotite_smooth_wall", + "id": "mineralogy:peridotite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json index 168d6dfc7..d47a46330 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:peridotite_stairs", + "id": "mineralogy:peridotite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_to_stone.json b/src/main/resources/data/mineralogy/recipes/peridotite_to_stone.json index 019758fa1..70289cc2e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:peridotite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json index d05c3efcd..d5ffc463d 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:peridotite_wall", + "id": "mineralogy:peridotite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json index 10a5c67b4..4ced3b859 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_block" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -22,7 +25,7 @@ } }, "result": { - "item": "mineralogy:phosphorous_block", + "id": "mineralogy:phosphorous_block", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json index e407ea1f5..b43c6e15d 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_dust" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:phosphorous_dust", + "id": "mineralogy:phosphorous_dust", "count": 9 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json index ae5391a85..6676694dc 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick", + "id": "mineralogy:phyllite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json index e1bfe9bcf..5eb666b32 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_brick", + "id": "mineralogy:phyllite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json index 814938c8b..08e9357df 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick_furnace", + "id": "mineralogy:phyllite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json index b211d607b..18c467de7 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick_slab", + "id": "mineralogy:phyllite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json index daeec0dfb..74235a619 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", + "id": "mineralogy:phyllite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json index 55736f260..817866d2e 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_brick", + "id": "mineralogy:phyllite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json index fdf91465e..d4eced2e6 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick_stairs", + "id": "mineralogy:phyllite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json index 67b3218d5..3883c2c94 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", + "id": "mineralogy:phyllite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json index ca2a4bb05..9bca616c4 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick_wall", + "id": "mineralogy:phyllite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json index b24ebbecf..3efabbf33 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", + "id": "mineralogy:phyllite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json index ee148a840..583f0c494 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json index b9e7114c9..313b7c801 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:phyllite_furnace", + "id": "mineralogy:phyllite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json index 875f94ad1..b9b8e4c16 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_brick", + "id": "mineralogy:phyllite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json index 40dccf90d..9d995247d 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth", + "id": "mineralogy:phyllite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json index 933f0c405..3f52ec272 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", + "id": "mineralogy:phyllite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json index 54bfae496..405db58a9 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", + "id": "mineralogy:phyllite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json index a641f603a..f9649cac7 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", + "id": "mineralogy:phyllite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json index 701d51bf2..8c99dde3f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_slab", + "id": "mineralogy:phyllite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json index ff745afc8..23189982b 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite", + "id": "mineralogy:phyllite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json index 192fca34f..2e31fb140 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick_slab", + "id": "mineralogy:phyllite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json index bd72e1b04..8cad1a28f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_stairs", + "id": "mineralogy:phyllite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json index e3c794042..70134e05f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick_stairs", + "id": "mineralogy:phyllite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json index 619bb079e..5970bdfc9 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth_wall", + "id": "mineralogy:phyllite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json index d68d00a46..56d316d5e 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:phyllite_brick_wall", + "id": "mineralogy:phyllite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json index a75ac7065..1c80798bd 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:phyllite_relief_axe", + "id": "mineralogy:phyllite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json index 89e8bc1df..fc0ebb3d7 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_blank", + "id": "mineralogy:phyllite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json index 4a9f32e7a..b29ca5a35 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_cross", + "id": "mineralogy:phyllite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json index afcb23380..8bfccf868 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_hammer", + "id": "mineralogy:phyllite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json index ebbe4aafc..04e98f1da 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:phyllite_relief_hoe", + "id": "mineralogy:phyllite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json index 20ed0a999..79b3b41c3 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_horizontal", + "id": "mineralogy:phyllite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json index e55bd45a2..1877d5df2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_i", + "id": "mineralogy:phyllite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json index 6a70a4064..7ee403a58 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_left", + "id": "mineralogy:phyllite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json index 9f03e1789..1c915f14b 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:phyllite_relief_pickaxe", + "id": "mineralogy:phyllite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json index 569fbfd01..22fe25101 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_plus", + "id": "mineralogy:phyllite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json index cbf86d5dd..d93b126f0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:phyllite_relief_right", + "id": "mineralogy:phyllite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json index ee8876c15..90828a4b5 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:phyllite_relief_sword", + "id": "mineralogy:phyllite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json index 0f9ac7783..64a5828a8 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_relief_vertical", + "id": "mineralogy:phyllite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json index 26e8045e4..3d7327a89 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:phyllite_slab", + "id": "mineralogy:phyllite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json index 176cf3e9b..357b92a25 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:phyllite_smooth", + "id": "mineralogy:phyllite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json index 886ffa729..b2c2f4b06 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick", + "id": "mineralogy:phyllite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json index de18c2b18..57e504e02 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_furnace", + "id": "mineralogy:phyllite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json index d8fb3c8cc..2830e8bac 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", + "id": "mineralogy:phyllite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json index 6007f8058..2903116c2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", + "id": "mineralogy:phyllite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json index 5863bb345..91cd18866 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", + "id": "mineralogy:phyllite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json index cde255c8c..e569bcb78 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_furnace", + "id": "mineralogy:phyllite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json index d3f7d015e..9281c6e36 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_slab", + "id": "mineralogy:phyllite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json index e8aa2839b..cddd033f8 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_stairs", + "id": "mineralogy:phyllite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json index 4a0c3d9c0..55ec89c91 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:phyllite_smooth_wall", + "id": "mineralogy:phyllite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json index 69e3a8b1b..c2d0ecc6f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:phyllite_stairs", + "id": "mineralogy:phyllite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_to_stone.json b/src/main/resources/data/mineralogy/recipes/phyllite_to_stone.json index d476483b5..1e07ab1b8 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:phyllite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json index ff0a09bf8..9898b0109 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:phyllite_wall", + "id": "mineralogy:phyllite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json index dea880509..7901f6e8a 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick", + "id": "mineralogy:quartzite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json index 5cf399bd1..3819e108d 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_brick", + "id": "mineralogy:quartzite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json index ecbff744c..b65fb4016 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick_furnace", + "id": "mineralogy:quartzite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json index 0237cf7bb..08ba2a09b 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick_slab", + "id": "mineralogy:quartzite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json index 6d18a307b..6bb793c32 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", + "id": "mineralogy:quartzite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json index 2726dd7be..7ddaa0486 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_brick", + "id": "mineralogy:quartzite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json index a314429e2..886d22e42 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick_stairs", + "id": "mineralogy:quartzite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json index b3fa56dc6..7aa267459 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", + "id": "mineralogy:quartzite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json index 3f20acca4..413f69e68 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick_wall", + "id": "mineralogy:quartzite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json index 6c07c3223..d6b8c98a8 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", + "id": "mineralogy:quartzite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json index dc8c599f0..1b6407671 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json index 41804f63b..113c6e4d6 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:quartzite_furnace", + "id": "mineralogy:quartzite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json index 9aec98da1..1c883d19b 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_brick", + "id": "mineralogy:quartzite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json index 273456b22..c9ac29910 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth", + "id": "mineralogy:quartzite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json index 3cfb21fba..0be1bd9fb 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", + "id": "mineralogy:quartzite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json index acc427644..7b2e93472 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", + "id": "mineralogy:quartzite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json index e67847c26..01ae7a373 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", + "id": "mineralogy:quartzite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json index 38ba12f1d..5e1b54c91 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_slab", + "id": "mineralogy:quartzite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json index 043c4205a..cbfb0c2a7 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite", + "id": "mineralogy:quartzite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json index a1e30a264..7a35aa973 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick_slab", + "id": "mineralogy:quartzite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json index 5cdfdaa43..2c70f5f3a 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_stairs", + "id": "mineralogy:quartzite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json index 8666b8fb8..10e75141a 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick_stairs", + "id": "mineralogy:quartzite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json index 26f539b34..a9605ac10 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth_wall", + "id": "mineralogy:quartzite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json index b0540f50c..3955c4144 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:quartzite_brick_wall", + "id": "mineralogy:quartzite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json index 5ad143631..7b9dd30eb 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:quartzite_relief_axe", + "id": "mineralogy:quartzite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json index 80ee88b3b..24ef1ecf4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_blank", + "id": "mineralogy:quartzite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json index bd7ec6962..48018ac44 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_cross", + "id": "mineralogy:quartzite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json index 040ece587..6bbb4ce74 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_hammer", + "id": "mineralogy:quartzite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json index 1585acfb2..c71e6a72e 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:quartzite_relief_hoe", + "id": "mineralogy:quartzite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json index fff324988..d2cc5309d 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_horizontal", + "id": "mineralogy:quartzite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json index bbb433078..dcf51e78c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_i", + "id": "mineralogy:quartzite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json index 2c95b6554..eecdb57a1 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_left", + "id": "mineralogy:quartzite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json index 760446112..3d7bcab2a 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:quartzite_relief_pickaxe", + "id": "mineralogy:quartzite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json index 2a495b15c..5af898a80 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_plus", + "id": "mineralogy:quartzite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json index c92132e9c..1518ee0e6 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:quartzite_relief_right", + "id": "mineralogy:quartzite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json index b61d399d6..504e8b76d 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:quartzite_relief_sword", + "id": "mineralogy:quartzite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json index 6fbd505d1..0bad65853 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_relief_vertical", + "id": "mineralogy:quartzite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json index dff0b7aab..be7e2e2ea 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:quartzite_slab", + "id": "mineralogy:quartzite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json index d586377f8..b1d5ab4f0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:quartzite_smooth", + "id": "mineralogy:quartzite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json index 03dcfeef6..65019591c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick", + "id": "mineralogy:quartzite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json index 81c934b2a..cbd33f8f0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_furnace", + "id": "mineralogy:quartzite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json index a37f1091c..cc5b96950 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", + "id": "mineralogy:quartzite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json index 4c711d518..1e8226ca8 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", + "id": "mineralogy:quartzite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json index e0185b4e9..f4ef33bf6 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", + "id": "mineralogy:quartzite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json index 47eab4804..9b48d8b71 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_furnace", + "id": "mineralogy:quartzite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json index 74f12deba..32c141b79 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_slab", + "id": "mineralogy:quartzite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json index ed5cfbee2..abd1f9e6f 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_stairs", + "id": "mineralogy:quartzite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json index 166ac1edb..4907c2123 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:quartzite_smooth_wall", + "id": "mineralogy:quartzite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json index 85132b8ac..4e1766e82 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:quartzite_stairs", + "id": "mineralogy:quartzite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_to_stone.json b/src/main/resources/data/mineralogy/recipes/quartzite_to_stone.json index cc7b7a3b2..644cfdb58 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:quartzite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json index fdacea6b3..12a6abc0f 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:quartzite_wall", + "id": "mineralogy:quartzite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json index 7c48e0efc..34e8b5e4a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick", + "id": "mineralogy:rhyolite_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json index 6e1f81dd4..f9d47e71b 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_brick", + "id": "mineralogy:rhyolite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json index 41b4f3161..2749bffe7 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick_furnace", + "id": "mineralogy:rhyolite_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json index dd15d0773..343fe8d64 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick_slab", + "id": "mineralogy:rhyolite_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json index a4f8a0b8d..140cf829f 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", + "id": "mineralogy:rhyolite_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json index 19de18844..ec0c35d95 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_brick", + "id": "mineralogy:rhyolite_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json index e6aa459f5..374f9ae50 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick_stairs", + "id": "mineralogy:rhyolite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json index 3581c894e..5eec57b5c 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", + "id": "mineralogy:rhyolite_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json index 0d512d973..3343fe56d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick_wall", + "id": "mineralogy:rhyolite_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json index 68c34992a..39d96a4e5 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", + "id": "mineralogy:rhyolite_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json index e0a391865..b603d4404 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json index e06d1c1fc..42ffb4013 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_furnace", + "id": "mineralogy:rhyolite_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json index de2921eb7..a4456132d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_brick", + "id": "mineralogy:rhyolite_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json index 1f2648a40..5f8b57d36 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth", + "id": "mineralogy:rhyolite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json index e3225c0ea..3a0479059 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", + "id": "mineralogy:rhyolite_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json index a113aa2ed..c1df84cac 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", + "id": "mineralogy:rhyolite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json index 5e52effb4..798df5106 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", + "id": "mineralogy:rhyolite_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json index 171a03e2e..187058ca5 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_slab", + "id": "mineralogy:rhyolite_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json index d955b9706..ab59fa087 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite", + "id": "mineralogy:rhyolite", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json index 1f59ec9f2..af6db62f6 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick_slab", + "id": "mineralogy:rhyolite_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json index 2f4606834..f484bcf8a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_stairs", + "id": "mineralogy:rhyolite_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json index ab398b757..23118d5e3 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick_stairs", + "id": "mineralogy:rhyolite_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json index 012fe0119..465126a68 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth_wall", + "id": "mineralogy:rhyolite_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json index c15a38e7f..d42685951 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_brick_wall", + "id": "mineralogy:rhyolite_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json index c151af0f3..2d0b64da9 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_relief_axe", + "id": "mineralogy:rhyolite_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json index 546e6638a..bd47d288c 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_blank", + "id": "mineralogy:rhyolite_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json index 298a62a4a..6514b0d63 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_cross", + "id": "mineralogy:rhyolite_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json index 88b4c9efa..c673feb31 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_hammer", + "id": "mineralogy:rhyolite_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json index b5357e634..9e2cb7f65 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_relief_hoe", + "id": "mineralogy:rhyolite_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json index 66a472b7d..5577f5cd8 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_horizontal", + "id": "mineralogy:rhyolite_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json index eecbad229..e55f9fc1f 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_i", + "id": "mineralogy:rhyolite_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json index ef939fa53..4b5f49ead 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_left", + "id": "mineralogy:rhyolite_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json index 965fde45c..b9a54670d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_relief_pickaxe", + "id": "mineralogy:rhyolite_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json index 2f048abc2..820cf34a0 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_plus", + "id": "mineralogy:rhyolite_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json index 67d3612fb..18c813d03 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_relief_right", + "id": "mineralogy:rhyolite_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json index 7bc3c9722..baaf83160 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_relief_sword", + "id": "mineralogy:rhyolite_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json index 6e6939b71..67e286420 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_relief_vertical", + "id": "mineralogy:rhyolite_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json index d0d5cc55b..48e9b3f52 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_slab", + "id": "mineralogy:rhyolite_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json index 5e0362cf4..8ffe0fa81 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:rhyolite_smooth", + "id": "mineralogy:rhyolite_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json index e1d085cbc..db97b8aaa 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick", + "id": "mineralogy:rhyolite_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json index 7e6aee565..b88c4737a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_furnace", + "id": "mineralogy:rhyolite_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json index 514e6600d..cc779de9d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", + "id": "mineralogy:rhyolite_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json index 2ec4ff131..8afbab5b6 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", + "id": "mineralogy:rhyolite_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json index a22f6135d..4e3944f5a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", + "id": "mineralogy:rhyolite_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json index cd44f1a67..144fafb15 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_furnace", + "id": "mineralogy:rhyolite_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json index 4ffdaf546..c21ade514 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_slab", + "id": "mineralogy:rhyolite_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json index 443c31aba..d29127681 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_stairs", + "id": "mineralogy:rhyolite_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json index 5f76c6e61..62708e073 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_smooth_wall", + "id": "mineralogy:rhyolite_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json index e5cc455f4..2b2310534 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_stairs", + "id": "mineralogy:rhyolite_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_to_stone.json b/src/main/resources/data/mineralogy/recipes/rhyolite_to_stone.json index f88217de3..e9ac9d471 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:rhyolite" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json index 715c9894e..3b42585cf 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rhyolite_wall", + "id": "mineralogy:rhyolite_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt.json b/src/main/resources/data/mineralogy/recipes/rock_salt.json index 4aa11c06b..8d1ff3c7f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rock_salt", + "id": "mineralogy:rock_salt", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json index c670a4f45..6f157c11e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick", + "id": "mineralogy:rock_salt_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json index 85645bd5f..81ff6fe9f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_brick", + "id": "mineralogy:rock_salt_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json index 3a891c468..da70f60f1 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick_furnace", + "id": "mineralogy:rock_salt_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json index 990f3c0f8..03824a06c 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick_slab", + "id": "mineralogy:rock_salt_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json index d81d7498b..327e94d17 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", + "id": "mineralogy:rock_salt_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json index fa6f4a6d0..cde606d69 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_brick", + "id": "mineralogy:rock_salt_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json index 0502e72e3..397cc0f7b 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick_stairs", + "id": "mineralogy:rock_salt_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json index b9cb69d4c..bac584a03 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", + "id": "mineralogy:rock_salt_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json index f18ff571c..27acd8d17 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick_wall", + "id": "mineralogy:rock_salt_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json index d5a973d9b..b0f256b58 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", + "id": "mineralogy:rock_salt_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json b/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json index f5947fca9..66ee589e6 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json b/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json index e3f4d41fc..0a1522d37 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_dust" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -13,7 +11,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_dust", + "id": "mineralogy:rock_salt_dust", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json index 12df9cfb0..9ce78cd55 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_furnace", + "id": "mineralogy:rock_salt_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json index 7924f0193..5ff91f58e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_brick", + "id": "mineralogy:rock_salt_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json index 015902cab..20386ab6f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth", + "id": "mineralogy:rock_salt_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json index 7a9210665..408b13d88 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", + "id": "mineralogy:rock_salt_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json index a20bfbf87..09bbcc3cf 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", + "id": "mineralogy:rock_salt_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json index 29a67f39f..b1428013b 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", + "id": "mineralogy:rock_salt_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json index a7f55b39d..a7132c634 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_slab", + "id": "mineralogy:rock_salt_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json index a36617fb8..05514d89d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt", + "id": "mineralogy:rock_salt", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json index 13aaf68d0..0624c968e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick_slab", + "id": "mineralogy:rock_salt_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json index 2ac772565..0a492eec0 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_stairs", + "id": "mineralogy:rock_salt_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json index 40785be11..fce89f610 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick_stairs", + "id": "mineralogy:rock_salt_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json index 78c5efe9f..2448aa65d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth_wall", + "id": "mineralogy:rock_salt_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json index 3d3323555..3eac0bc14 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_brick_wall", + "id": "mineralogy:rock_salt_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json index 911d9ff08..32367b841 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_relief_axe", + "id": "mineralogy:rock_salt_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json index 96870efd4..b2c6a7d17 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_blank", + "id": "mineralogy:rock_salt_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json index 4b643f9f4..39dafc34e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_cross", + "id": "mineralogy:rock_salt_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json index 3b220556a..aa5a1f817 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_hammer", + "id": "mineralogy:rock_salt_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json index c7bcb4da3..854b8c44c 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_relief_hoe", + "id": "mineralogy:rock_salt_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json index a972269fd..7600d98fa 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_horizontal", + "id": "mineralogy:rock_salt_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json index 4523d382c..05e88790c 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_i", + "id": "mineralogy:rock_salt_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json index f48ddcbbf..9bfbb9af6 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_left", + "id": "mineralogy:rock_salt_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json index c8585c23f..005709dd3 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_relief_pickaxe", + "id": "mineralogy:rock_salt_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json index c8d912aa3..0e666fdbb 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_plus", + "id": "mineralogy:rock_salt_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json index f77c94826..f1cad20c2 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_relief_right", + "id": "mineralogy:rock_salt_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json index f64db052e..4f5b89f06 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_relief_sword", + "id": "mineralogy:rock_salt_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json index df5c0457f..572153b0e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_relief_vertical", + "id": "mineralogy:rock_salt_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json index dc3796958..d2687512b 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_slab", + "id": "mineralogy:rock_salt_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json index f5b3a6488..017f8e070 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:rock_salt_smooth", + "id": "mineralogy:rock_salt_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json index 0048b317d..7b2afcd88 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick", + "id": "mineralogy:rock_salt_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json index 22b1bf142..f5d9ffc82 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_furnace", + "id": "mineralogy:rock_salt_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json index cac5dd8dc..6f0746735 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", + "id": "mineralogy:rock_salt_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json index 66b2ff845..a352602f4 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", + "id": "mineralogy:rock_salt_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json index 6ba4e4a5c..4845abc8d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", + "id": "mineralogy:rock_salt_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json index 84a931cbc..da91b3668 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_furnace", + "id": "mineralogy:rock_salt_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json index 127143ef9..f05c63487 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_slab", + "id": "mineralogy:rock_salt_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json index 7a89eee78..5a312cb24 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_stairs", + "id": "mineralogy:rock_salt_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json index 049fcbc50..4bec0e9a9 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_smooth_wall", + "id": "mineralogy:rock_salt_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json index bfc4c570d..c0e073a27 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_stairs", + "id": "mineralogy:rock_salt_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_to_stone.json b/src/main/resources/data/mineralogy/recipes/rock_salt_to_stone.json index 155c27c27..bd2d8cd33 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:rock_salt" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json index 6869cbe1a..cf6113b89 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:rock_salt_wall", + "id": "mineralogy:rock_salt_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json index 7b8c85d0d..ec4519df4 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltlamp" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -23,7 +26,7 @@ } ], "result": { - "item": "mineralogy:rocksaltlamp", + "id": "mineralogy:rocksaltlamp", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json index 01d534074..b18369e31 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltstreetlamp" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -25,7 +28,7 @@ } }, "result": { - "item": "mineralogy:rocksaltstreetlamp", + "id": "mineralogy:rocksaltstreetlamp", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick.json b/src/main/resources/data/mineralogy/recipes/schist_brick.json index 91b1a9def..64d093b4c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:schist_brick", + "id": "mineralogy:schist_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json index e010ded65..7be8a54e1 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_brick", + "id": "mineralogy:schist_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json index b163dba9b..ea7d76eab 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:schist_brick_furnace", + "id": "mineralogy:schist_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json index 9de1854ee..03260eaf3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:schist_brick_slab", + "id": "mineralogy:schist_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json index 00c6e2318..44834412d 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_brick_slab", + "id": "mineralogy:schist_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json index 57102a8b8..77af8b571 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_brick", + "id": "mineralogy:schist_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json index 33296a308..7b8b1d553 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_brick_stairs", + "id": "mineralogy:schist_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json index 9a0335f38..358235e83 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_brick_stairs", + "id": "mineralogy:schist_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json b/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json index d9eb94897..703144239 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:schist_brick_wall", + "id": "mineralogy:schist_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json index 816c213a8..bdcf0fc0f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_brick_wall", + "id": "mineralogy:schist_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json index d6e9c1e86..79e827355 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_furnace.json index 4c2bb9fe9..9b20891b2 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:schist_furnace", + "id": "mineralogy:schist_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json index 4bc3cca1c..e2a181b21 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_brick", + "id": "mineralogy:schist_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json index a66bbcce3..3ea285421 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth", + "id": "mineralogy:schist_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json index 106884e29..fe9769675 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick_slab", + "id": "mineralogy:schist_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json index 4318c6263..bf534a813 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick_stairs", + "id": "mineralogy:schist_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json index 9faa36eab..ef5b37b1c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick_wall", + "id": "mineralogy:schist_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json index 860738253..7a89e9a85 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_slab", + "id": "mineralogy:schist_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json index 5de0adf79..0d0b0762e 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist", + "id": "mineralogy:schist", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json index fbebdbeac..3591a1636 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:schist_brick_slab", + "id": "mineralogy:schist_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json index 2ff660bb1..70a683f96 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_stairs", + "id": "mineralogy:schist_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json index 073c9e54a..5a103ec91 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:schist_brick_stairs", + "id": "mineralogy:schist_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json index 4eee5d0a2..60b8aba3a 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth_wall", + "id": "mineralogy:schist_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json index 86fcbafc8..061d8de74 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:schist_brick_wall", + "id": "mineralogy:schist_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json index 8b39d408b..3371ed5ce 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:schist_relief_axe", + "id": "mineralogy:schist_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json b/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json index f23d27913..ca30d9ca7 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_blank", + "id": "mineralogy:schist_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json b/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json index 39863fbe9..fb64078c4 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_cross", + "id": "mineralogy:schist_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json index a133749ee..1e84d71a4 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_hammer", + "id": "mineralogy:schist_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json index 06ae81f1f..ff4102652 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:schist_relief_hoe", + "id": "mineralogy:schist_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json index 31d9d688c..e51f719f8 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_horizontal", + "id": "mineralogy:schist_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_i.json b/src/main/resources/data/mineralogy/recipes/schist_relief_i.json index 2f2608326..7c8883a2c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_i", + "id": "mineralogy:schist_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_left.json b/src/main/resources/data/mineralogy/recipes/schist_relief_left.json index 11da98a96..beaf1c62d 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_left", + "id": "mineralogy:schist_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json index 13d6d2260..77aa67c66 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:schist_relief_pickaxe", + "id": "mineralogy:schist_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json b/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json index eb0c14049..9c744c2fc 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_plus", + "id": "mineralogy:schist_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_right.json b/src/main/resources/data/mineralogy/recipes/schist_relief_right.json index 93c2dcc25..92011aa03 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:schist_relief_right", + "id": "mineralogy:schist_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json b/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json index 4f55d78f4..66688ee38 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:schist_relief_sword", + "id": "mineralogy:schist_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json index d9aea076b..82b89d8ab 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_relief_vertical", + "id": "mineralogy:schist_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_slab.json b/src/main/resources/data/mineralogy/recipes/schist_slab.json index a49c49663..5f95189a1 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:schist_slab", + "id": "mineralogy:schist_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/recipes/schist_smooth.json index 25987a0ac..a51236e36 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:schist_smooth", + "id": "mineralogy:schist_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json index ad0b01321..983836740 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick", + "id": "mineralogy:schist_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json index f057e5dad..17a8d5838 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick_furnace", + "id": "mineralogy:schist_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json index 195055e7b..ecb03b298 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick_slab", + "id": "mineralogy:schist_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json index 91d372e2b..4062b0305 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick_stairs", + "id": "mineralogy:schist_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json index 5982a663f..8b4e6b0ee 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_brick_wall", + "id": "mineralogy:schist_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json index fe7f8a5ec..b5b7ddbd0 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_furnace", + "id": "mineralogy:schist_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json index beaf125fe..0575c5155 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_slab", + "id": "mineralogy:schist_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json index 539581cf8..e95d278c9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_stairs", + "id": "mineralogy:schist_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json index 44f59a618..7857a8786 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:schist_smooth_wall", + "id": "mineralogy:schist_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_stairs.json index 016180f4d..990c818c9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:schist_stairs", + "id": "mineralogy:schist_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/schist_to_stone.json b/src/main/resources/data/mineralogy/recipes/schist_to_stone.json index 26fa0f56d..ee3c705ab 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/schist_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:schist" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/schist_wall.json b/src/main/resources/data/mineralogy/recipes/schist_wall.json index 8346b795d..b2cd064e1 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:schist_wall", + "id": "mineralogy:schist_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_brick.json index 0f13b15d0..1f7c766b0 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick", + "id": "mineralogy:scoria_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json index 2efc1c242..ab644335e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_brick", + "id": "mineralogy:scoria_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json index 235e86210..b5a1b2a7d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick_furnace", + "id": "mineralogy:scoria_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json index efb276121..e98b31f3b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick_slab", + "id": "mineralogy:scoria_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json index c4a0b2139..87750761c 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_brick_slab", + "id": "mineralogy:scoria_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json index a73a526b8..b13d15b9c 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_brick", + "id": "mineralogy:scoria_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json index 50b79ffc7..d2f60f31f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick_stairs", + "id": "mineralogy:scoria_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json index 82893d6d7..b3c307130 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", + "id": "mineralogy:scoria_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json index d9cde5a4b..b8c72f989 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick_wall", + "id": "mineralogy:scoria_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json index 84d5b3df6..3df29ed4f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_brick_wall", + "id": "mineralogy:scoria_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json index fc494b839..3a56f8a65 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json index 7e10ff07c..296b71d9b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:scoria_furnace", + "id": "mineralogy:scoria_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json index fc4209e61..601305053 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_brick", + "id": "mineralogy:scoria_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json index bc13b5650..2f1b1e81b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth", + "id": "mineralogy:scoria_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json index 25dc5f153..69b627b3e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick_slab", + "id": "mineralogy:scoria_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json index a94f605ff..a92e15e98 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", + "id": "mineralogy:scoria_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json index 2da9d5487..18e515aa7 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick_wall", + "id": "mineralogy:scoria_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json index 620f0c32f..03c55cef5 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_slab", + "id": "mineralogy:scoria_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json index 17aff2939..c8d0b6d1a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria", + "id": "mineralogy:scoria", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json index 1ccaf4dbe..023b20687 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick_slab", + "id": "mineralogy:scoria_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json index 166bee12c..ac948d55b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_stairs", + "id": "mineralogy:scoria_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json index 4577e0eca..0a7778459 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick_stairs", + "id": "mineralogy:scoria_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json index 113144d12..b6cf6fedb 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth_wall", + "id": "mineralogy:scoria_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json index 2bb43f959..2048c766b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:scoria_brick_wall", + "id": "mineralogy:scoria_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json index 6dddf2372..e93d1197a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:scoria_relief_axe", + "id": "mineralogy:scoria_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json index 53e801af1..e42f152a5 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_blank", + "id": "mineralogy:scoria_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json index f93c87974..5a6055f50 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_cross", + "id": "mineralogy:scoria_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json index c530f11a1..bc0397b00 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_hammer", + "id": "mineralogy:scoria_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json index 6b3ad341e..35b99e5d4 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:scoria_relief_hoe", + "id": "mineralogy:scoria_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json index 342a5e328..ddadab9a2 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_horizontal", + "id": "mineralogy:scoria_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json index bd103b3b4..9674e78f2 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_i", + "id": "mineralogy:scoria_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json index e1357339a..c7bc50d72 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_left", + "id": "mineralogy:scoria_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json index 597bda593..fb8a80b4d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:scoria_relief_pickaxe", + "id": "mineralogy:scoria_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json index e33f7092d..0f2208e49 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_plus", + "id": "mineralogy:scoria_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json index 3d29a2704..246402059 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:scoria_relief_right", + "id": "mineralogy:scoria_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json index 821e1b414..d8c2d9338 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:scoria_relief_sword", + "id": "mineralogy:scoria_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json index 71d1fc51f..236db9a41 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_relief_vertical", + "id": "mineralogy:scoria_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_slab.json index ec443619a..b3b4912ad 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:scoria_slab", + "id": "mineralogy:scoria_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json index 4fe74733d..7c89c5a6f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:scoria_smooth", + "id": "mineralogy:scoria_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json index a960fcb01..e2c6558ce 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick", + "id": "mineralogy:scoria_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json index 71bb9f045..b982203a1 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick_furnace", + "id": "mineralogy:scoria_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json index 9c6537276..332904e28 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick_slab", + "id": "mineralogy:scoria_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json index a46f62bbf..870cbf8e3 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", + "id": "mineralogy:scoria_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json index dd8783120..c540fb0f0 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_brick_wall", + "id": "mineralogy:scoria_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json index d93b9ca88..42ce4ca21 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_furnace", + "id": "mineralogy:scoria_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json index 45d2b0eff..c9b1ec6f9 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_slab", + "id": "mineralogy:scoria_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json index 3f929fa48..2cf5763b8 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_stairs", + "id": "mineralogy:scoria_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json index 2f2a23d85..7cb21d013 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:scoria_smooth_wall", + "id": "mineralogy:scoria_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json index 59087bf2d..5178292c0 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:scoria_stairs", + "id": "mineralogy:scoria_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/scoria_to_stone.json b/src/main/resources/data/mineralogy/recipes/scoria_to_stone.json index 7dede9dab..8ed1a0a8d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:scoria" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_wall.json index c8fedace6..229a4dd0c 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:scoria_wall", + "id": "mineralogy:scoria_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick.json b/src/main/resources/data/mineralogy/recipes/shale_brick.json index 4e4b194b4..cdbc57a79 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:shale_brick", + "id": "mineralogy:shale_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json index 74194e208..c75e055b0 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_brick", + "id": "mineralogy:shale_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json index 36e2c5f43..89d3a0895 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:shale_brick_furnace", + "id": "mineralogy:shale_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json index 4e7b9aa5f..08082ad22 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:shale_brick_slab", + "id": "mineralogy:shale_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json index 484ff3de8..0737bf624 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_brick_slab", + "id": "mineralogy:shale_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json index 15434408c..eac59195d 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_brick", + "id": "mineralogy:shale_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json index d539beece..1018e00eb 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_brick_stairs", + "id": "mineralogy:shale_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json index 25f8a11c1..b825a0982 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_brick_stairs", + "id": "mineralogy:shale_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json b/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json index 0c96003fe..bf6665f70 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:shale_brick_wall", + "id": "mineralogy:shale_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json index b9142589b..b8594a889 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_brick_wall", + "id": "mineralogy:shale_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json index c577049dc..d70dac06a 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_furnace.json index d52d5894b..3fbec216a 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:shale_furnace", + "id": "mineralogy:shale_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json index 48656254d..9b949d960 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_brick", + "id": "mineralogy:shale_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json index bb2b06df3..86f4fde28 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth", + "id": "mineralogy:shale_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json index ec90e1e2d..f5cb26568 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick_slab", + "id": "mineralogy:shale_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json index 6b2a0df35..241045c73 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick_stairs", + "id": "mineralogy:shale_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json index b4f4b14c1..52342d626 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick_wall", + "id": "mineralogy:shale_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json index 33704f676..029a78044 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_slab", + "id": "mineralogy:shale_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json index 25aa8548e..83a3377df 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale", + "id": "mineralogy:shale", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json index 143d0c292..df83e963d 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:shale_brick_slab", + "id": "mineralogy:shale_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json index 6e252fdc5..faec29855 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_stairs", + "id": "mineralogy:shale_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json index 8ffe92f3b..ddb3bd31b 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:shale_brick_stairs", + "id": "mineralogy:shale_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json index 86087876b..cb6cf226a 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth_wall", + "id": "mineralogy:shale_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json index 7f532b662..f1f48d9a5 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:shale_brick_wall", + "id": "mineralogy:shale_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json index 696442e7d..0395519f8 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:shale_relief_axe", + "id": "mineralogy:shale_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json b/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json index c01ad2a16..72502f5b1 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_blank", + "id": "mineralogy:shale_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json b/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json index 6a2aa49f8..2b6786040 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_cross", + "id": "mineralogy:shale_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json index cc439ee0a..0dc83483f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_hammer", + "id": "mineralogy:shale_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json index 342488993..732c07549 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:shale_relief_hoe", + "id": "mineralogy:shale_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json index 4c3de4838..e6de2782e 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_horizontal", + "id": "mineralogy:shale_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_i.json b/src/main/resources/data/mineralogy/recipes/shale_relief_i.json index 6ee9329c7..26056f5ad 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_i", + "id": "mineralogy:shale_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_left.json b/src/main/resources/data/mineralogy/recipes/shale_relief_left.json index c18cb2733..46cad3e1e 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_left", + "id": "mineralogy:shale_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json index e38c9c636..e44e45632 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:shale_relief_pickaxe", + "id": "mineralogy:shale_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json b/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json index 6fd472b1a..0986d17f5 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_plus", + "id": "mineralogy:shale_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_right.json b/src/main/resources/data/mineralogy/recipes/shale_relief_right.json index 4b331cbe4..1defcb9d7 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:shale_relief_right", + "id": "mineralogy:shale_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json b/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json index 77e309998..df1fd05c1 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:shale_relief_sword", + "id": "mineralogy:shale_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json index 0fd26a633..896152a61 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_relief_vertical", + "id": "mineralogy:shale_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_slab.json b/src/main/resources/data/mineralogy/recipes/shale_slab.json index c27b75d80..b23698480 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:shale_slab", + "id": "mineralogy:shale_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/recipes/shale_smooth.json index 7c0874ec8..c0177e615 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:shale_smooth", + "id": "mineralogy:shale_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json index 66480ad13..e9d3304d8 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick", + "id": "mineralogy:shale_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json index 719f85c60..333b21437 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick_furnace", + "id": "mineralogy:shale_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json index 07866cfbf..6bae3cfb9 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick_slab", + "id": "mineralogy:shale_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json index bef3795e5..1df69f00f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick_stairs", + "id": "mineralogy:shale_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json index afe3cf043..fcb9ccd2e 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_brick_wall", + "id": "mineralogy:shale_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json index eb2cdeecc..c90ee8221 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_furnace", + "id": "mineralogy:shale_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json index eeee1f986..397309496 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_slab", + "id": "mineralogy:shale_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json index 451bf3a79..9c931397e 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_stairs", + "id": "mineralogy:shale_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json index 72d85a9a0..daab1b22e 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:shale_smooth_wall", + "id": "mineralogy:shale_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_stairs.json index 32e808e39..5d1ad00e9 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:shale_stairs", + "id": "mineralogy:shale_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/shale_to_stone.json b/src/main/resources/data/mineralogy/recipes/shale_to_stone.json index 48fa97d75..d33b5f579 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/shale_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:shale" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/shale_wall.json b/src/main/resources/data/mineralogy/recipes/shale_wall.json index 9308f0192..dd65f2018 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:shale_wall", + "id": "mineralogy:shale_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json index a6fb2faca..5561f5994 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick", + "id": "mineralogy:siltstone_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json index 005985a50..7c174c8fa 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_brick", + "id": "mineralogy:siltstone_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json index d21f0d1cf..621fd471b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick_furnace", + "id": "mineralogy:siltstone_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json index b9977b0ec..2d2201b87 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick_slab", + "id": "mineralogy:siltstone_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json index 5047e1976..c75911bc3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", + "id": "mineralogy:siltstone_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json index 3f3825870..93cbfcef4 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_brick", + "id": "mineralogy:siltstone_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json index dd61e3b8e..fe2d707af 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick_stairs", + "id": "mineralogy:siltstone_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json index fad21efd7..62a5d7e2f 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", + "id": "mineralogy:siltstone_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json index e298cbff8..657ac9715 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick_wall", + "id": "mineralogy:siltstone_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json index af5564c69..935978323 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", + "id": "mineralogy:siltstone_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json index a278b3977..1d35bbb38 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json index a93f1e91e..e2d15b75f 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:siltstone_furnace", + "id": "mineralogy:siltstone_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json index ef73b2262..1fee43003 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_brick", + "id": "mineralogy:siltstone_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json index 74927cafe..78dde61d2 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth", + "id": "mineralogy:siltstone_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json index ab025a207..b9f541ca3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", + "id": "mineralogy:siltstone_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json index 7921c1bdc..8184010fd 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", + "id": "mineralogy:siltstone_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json index 745738d0b..0906d99fc 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", + "id": "mineralogy:siltstone_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json index a907fe720..5511f5eff 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_slab", + "id": "mineralogy:siltstone_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json index 069faac14..b811b2f1b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone", + "id": "mineralogy:siltstone", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json index 72a34a70c..83a6ce3f3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick_slab", + "id": "mineralogy:siltstone_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json index 58aaaab36..4a02ad56e 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_stairs", + "id": "mineralogy:siltstone_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json index 13f378710..9a8640f05 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick_stairs", + "id": "mineralogy:siltstone_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json index 15e2bf6f4..5648e7a37 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth_wall", + "id": "mineralogy:siltstone_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json index 93d504b8b..bb593e34b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:siltstone_brick_wall", + "id": "mineralogy:siltstone_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json index 049da3e91..100db5578 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:siltstone_relief_axe", + "id": "mineralogy:siltstone_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json index aac297105..5db55ccbd 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_blank", + "id": "mineralogy:siltstone_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json index 988a0ebf9..b3f75d082 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_cross", + "id": "mineralogy:siltstone_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json index 57f59223a..e6257e7f2 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_hammer", + "id": "mineralogy:siltstone_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json index 176fd4a8e..d7972cd3d 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:siltstone_relief_hoe", + "id": "mineralogy:siltstone_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json index 66c8712c6..a42b9abe7 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_horizontal", + "id": "mineralogy:siltstone_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json index 2878e0d1a..d6fe7a967 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_i", + "id": "mineralogy:siltstone_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json index f4df2943f..839cf7a07 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_left", + "id": "mineralogy:siltstone_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json index e3ab72fd5..32576bf7a 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:siltstone_relief_pickaxe", + "id": "mineralogy:siltstone_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json index 19db63569..b72f3f726 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_plus", + "id": "mineralogy:siltstone_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json index 11351a8ed..89b4f9363 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:siltstone_relief_right", + "id": "mineralogy:siltstone_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json index ce2fc7649..ad0d9150c 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:siltstone_relief_sword", + "id": "mineralogy:siltstone_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json index b0a0defbe..049939810 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_relief_vertical", + "id": "mineralogy:siltstone_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json index 88ed148de..78de32441 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:siltstone_slab", + "id": "mineralogy:siltstone_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json index 0d1fa5ed5..63ec5f817 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:siltstone_smooth", + "id": "mineralogy:siltstone_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json index d6697436f..f507e3da4 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick", + "id": "mineralogy:siltstone_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json index 6f9512251..0a3e466ae 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_furnace", + "id": "mineralogy:siltstone_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json index 8e2cc1faf..29e287c20 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", + "id": "mineralogy:siltstone_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json index ea63704b8..a41dd941d 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", + "id": "mineralogy:siltstone_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json index 6d91ddc44..e677a5526 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", + "id": "mineralogy:siltstone_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json index fc8adba08..8c0cd2d97 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_furnace", + "id": "mineralogy:siltstone_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json index 0b80421b3..fc514c3dc 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_slab", + "id": "mineralogy:siltstone_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json index ffad39b99..af2bdce07 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_stairs", + "id": "mineralogy:siltstone_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json index cdcaf2ab1..0f2eb1bfe 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:siltstone_smooth_wall", + "id": "mineralogy:siltstone_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json index 19f26484d..80ab50d47 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:siltstone_stairs", + "id": "mineralogy:siltstone_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_to_stone.json b/src/main/resources/data/mineralogy/recipes/siltstone_to_stone.json index a4a875eb7..301942ef0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:siltstone" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json index 68f3a150f..37bf58cc0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:siltstone_wall", + "id": "mineralogy:siltstone_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick.json b/src/main/resources/data/mineralogy/recipes/slate_brick.json index 511d915bb..f23ab8159 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:slate_brick", + "id": "mineralogy:slate_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json index 0fb7dc16b..12790d30d 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_brick", + "id": "mineralogy:slate_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json index f2b2bbb7a..97a60a047 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:slate_brick_furnace", + "id": "mineralogy:slate_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json index cae97bcbe..0ca8a2a05 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:slate_brick_slab", + "id": "mineralogy:slate_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json index a14ef6812..93320a40a 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_brick_slab", + "id": "mineralogy:slate_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json index 13fe0d855..220675b5a 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_brick", + "id": "mineralogy:slate_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json index 432599852..13d9a3f90 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_brick_stairs", + "id": "mineralogy:slate_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json index b7eb22beb..622c55bf3 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_brick_stairs", + "id": "mineralogy:slate_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json b/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json index ffd27e712..6759c36fb 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:slate_brick_wall", + "id": "mineralogy:slate_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json index 409ed752e..dd385ab47 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_brick_wall", + "id": "mineralogy:slate_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json index 9c7e7bd49..e91742d65 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_furnace.json index 85d03d006..417ddb1fa 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:slate_furnace", + "id": "mineralogy:slate_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json index 4151e31ad..4b90d5a71 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_brick", + "id": "mineralogy:slate_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json index 1d36c3a17..bcf144b10 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth", + "id": "mineralogy:slate_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json index c4a29432d..5ddaff2e1 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick_slab", + "id": "mineralogy:slate_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json index c24d6fda8..988f8247b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick_stairs", + "id": "mineralogy:slate_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json index 1e6b9195d..d1597c7d1 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick_wall", + "id": "mineralogy:slate_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json index 93456da6e..2bafcd696 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_slab", + "id": "mineralogy:slate_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json index 17f5a79fb..378b36f48 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate", + "id": "mineralogy:slate", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json index e356af577..4406fb716 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:slate_brick_slab", + "id": "mineralogy:slate_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json index 1a758b2fc..41309f194 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_stairs", + "id": "mineralogy:slate_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json index d0c6f2190..c2430ce55 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:slate_brick_stairs", + "id": "mineralogy:slate_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json index 8bd1065eb..0173be409 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth_wall", + "id": "mineralogy:slate_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json index e3ac2fe77..f3cd5779e 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:slate_brick_wall", + "id": "mineralogy:slate_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json index 93ae56937..da1c85da4 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:slate_relief_axe", + "id": "mineralogy:slate_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json b/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json index e1316465f..9c39d8d80 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_blank", + "id": "mineralogy:slate_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json b/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json index 66f6cd08f..5aff20654 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_cross", + "id": "mineralogy:slate_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json index 5baab9a12..992b43bd6 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_hammer", + "id": "mineralogy:slate_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json index 5401e4ab6..dd6832e13 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:slate_relief_hoe", + "id": "mineralogy:slate_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json index da0b808a4..800aa879f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_horizontal", + "id": "mineralogy:slate_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_i.json b/src/main/resources/data/mineralogy/recipes/slate_relief_i.json index e507ca1c7..08e907f18 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_i", + "id": "mineralogy:slate_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_left.json b/src/main/resources/data/mineralogy/recipes/slate_relief_left.json index 0a2951d91..4e30cec06 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_left", + "id": "mineralogy:slate_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json index 9cf7e7651..8c830c513 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:slate_relief_pickaxe", + "id": "mineralogy:slate_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json b/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json index 5954bd060..092f77f8b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_plus", + "id": "mineralogy:slate_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_right.json b/src/main/resources/data/mineralogy/recipes/slate_relief_right.json index 37ad9cb4a..3c24f4986 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:slate_relief_right", + "id": "mineralogy:slate_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json b/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json index 4078be550..bfb650161 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:slate_relief_sword", + "id": "mineralogy:slate_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json index c767cc739..4135d7294 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_relief_vertical", + "id": "mineralogy:slate_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_slab.json b/src/main/resources/data/mineralogy/recipes/slate_slab.json index 5d279b577..458db5341 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:slate_slab", + "id": "mineralogy:slate_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/recipes/slate_smooth.json index a060845d1..5b77bdf25 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:slate_smooth", + "id": "mineralogy:slate_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json index 870c7b67a..16cbc7b90 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick", + "id": "mineralogy:slate_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json index 833adf3b9..bc82e74d0 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick_furnace", + "id": "mineralogy:slate_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json index 28ee016b2..2933df19e 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick_slab", + "id": "mineralogy:slate_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json index 1cd71a952..6cdf0566a 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick_stairs", + "id": "mineralogy:slate_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json index c1df30f92..1a4f733e9 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_brick_wall", + "id": "mineralogy:slate_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json index 2d1f97bf5..1b8f47c9b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_furnace", + "id": "mineralogy:slate_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json index 58062275e..db9def1ce 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_slab", + "id": "mineralogy:slate_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json index 1b918476d..1282768da 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_stairs", + "id": "mineralogy:slate_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json index 085c2f6cd..f1f36f007 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:slate_smooth_wall", + "id": "mineralogy:slate_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_stairs.json index f0462d0e5..0c1f3b298 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:slate_stairs", + "id": "mineralogy:slate_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/slate_to_stone.json b/src/main/resources/data/mineralogy/recipes/slate_to_stone.json index 67b7b57c3..b72d76f29 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/slate_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:slate" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/slate_wall.json b/src/main/resources/data/mineralogy/recipes/slate_wall.json index f7108c640..3a35f377e 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:slate_wall", + "id": "mineralogy:slate_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/recipes/sulfur_block.json index a34b3ef07..3259b7b1c 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_block.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_block.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_block" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -22,7 +25,7 @@ } }, "result": { - "item": "mineralogy:sulfur_block", + "id": "mineralogy:sulfur_block", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json index 7b98aafc5..ce54481e1 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_dust" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -17,7 +20,7 @@ } ], "result": { - "item": "mineralogy:sulfur_dust", + "id": "mineralogy:sulfur_dust", "count": 9 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_brick.json index e32b88128..3d0d00eb3 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick", + "id": "mineralogy:tuff_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json index 2a17c95a2..1586802cd 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_brick", + "id": "mineralogy:tuff_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json index f6d5d8bc0..96db441e4 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick_furnace", + "id": "mineralogy:tuff_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json index bb08ab81a..0e2c1b2c7 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick_slab", + "id": "mineralogy:tuff_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json index 41bd64bd3..b06b29dab 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_brick_slab", + "id": "mineralogy:tuff_smooth_brick_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json index cee99bbd9..b600d63e6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_brick", + "id": "mineralogy:tuff_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json index af3e1a1b6..77c1b3b1a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick_stairs", + "id": "mineralogy:tuff_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json index 05612f013..dba081929 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", + "id": "mineralogy:tuff_smooth_brick_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json index b705a5e21..223ea474a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick_wall", + "id": "mineralogy:tuff_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json index 3a1d52289..b9df45780 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_brick_wall", + "id": "mineralogy:tuff_smooth_brick_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json index ee03be543..062ff4931 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json @@ -1,7 +1,4 @@ { - "conditions": [ - - ], "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -19,7 +16,7 @@ } ], "result": { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json index e435f7148..0f4e580da 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:tuff_furnace", + "id": "mineralogy:tuff_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json index 1d4f61c70..c1d65cd31 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_brick", + "id": "mineralogy:tuff_smooth_brick", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json index 44fc05fd8..812cc4099 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth", + "id": "mineralogy:tuff_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json index f9c5e31ec..f295ee512 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick_slab", + "id": "mineralogy:tuff_smooth_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json index 4f40b05f1..75c1c5db1 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", + "id": "mineralogy:tuff_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json index d5e043f5b..e34e54b31 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick_wall", + "id": "mineralogy:tuff_smooth_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json index 06d81ee67..11bc4ac19 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_slab", + "id": "mineralogy:tuff_smooth_slab", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json index a7b2e1362..332340800 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff", + "id": "mineralogy:tuff", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json index 2eacd482f..460588512 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick_slab", + "id": "mineralogy:tuff_brick_slab", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json index ce39c7200..8fefb8be5 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_stairs", + "id": "mineralogy:tuff_smooth_stairs", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json index 917a95a05..e7f338cea 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick_stairs", + "id": "mineralogy:tuff_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json index 93f811f25..e24d2af25 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ] + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -20,7 +23,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth_wall", + "id": "mineralogy:tuff_smooth_wall", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json index f2885d13a..183dbf238 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json @@ -1,14 +1,17 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ] + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -21,7 +24,7 @@ } }, "result": { - "item": "mineralogy:tuff_brick_wall", + "id": "mineralogy:tuff_brick_wall", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json index 862b6b5a8..6684a11c9 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_axe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:tuff_relief_axe", + "id": "mineralogy:tuff_relief_axe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json index 12585c8c5..d85028b55 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_blank" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_blank", + "id": "mineralogy:tuff_relief_blank", "count": 16 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json index 3e49274b4..535556586 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_cross" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_cross", + "id": "mineralogy:tuff_relief_cross", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json index c7d404974..8eed4c0d4 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hammer" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -24,7 +22,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_hammer", + "id": "mineralogy:tuff_relief_hammer", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json index dc0ed8967..d3c9905ff 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hoe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:tuff_relief_hoe", + "id": "mineralogy:tuff_relief_hoe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json index afb0a6d15..6e30c35be 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_horizontal" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_horizontal", + "id": "mineralogy:tuff_relief_horizontal", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json index e46148b78..4a3051a4e 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_i" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_i", + "id": "mineralogy:tuff_relief_i", "count": 7 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json index 40cdb486f..e39bfceb6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_left" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_left", + "id": "mineralogy:tuff_relief_left", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json index 8848b23f9..73ce54051 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_pickaxe" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:tuff_relief_pickaxe", + "id": "mineralogy:tuff_relief_pickaxe", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json index 14ba81fc8..d4a1c61d0 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_plus" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_plus", + "id": "mineralogy:tuff_relief_plus", "count": 5 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json index af96afee9..23c827902 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_right" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:tuff_relief_right", + "id": "mineralogy:tuff_relief_right", "count": 2 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json index 4c660f319..cfd084004 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_sword" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -37,7 +35,7 @@ } ], "result": { - "item": "mineralogy:tuff_relief_sword", + "id": "mineralogy:tuff_relief_sword", "count": 8 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json index 127dfa308..573a40ea2 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_vertical" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_relief_vertical", + "id": "mineralogy:tuff_relief_vertical", "count": 3 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_slab.json index 6e952eab8..ff0bca80a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:tuff_slab", + "id": "mineralogy:tuff_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json index 7bf2056d2..f67db17dc 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + }, "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ @@ -16,7 +14,7 @@ } ], "result": { - "item": "mineralogy:tuff_smooth", + "id": "mineralogy:tuff_smooth", "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json index 883a65e2c..8a354fb9a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick", + "id": "mineralogy:tuff_smooth_brick", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json index 661acc52a..63075b394 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick_furnace", + "id": "mineralogy:tuff_smooth_brick_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json index 8b7f44816..fd2e2ba90 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick_slab", + "id": "mineralogy:tuff_smooth_brick_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json index daa9b2e18..192ad6579 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", + "id": "mineralogy:tuff_smooth_brick_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json index 63373782f..7a301aa82 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_brick_wall", + "id": "mineralogy:tuff_smooth_brick_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json index 9e95f0c68..b435a3806 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_furnace" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + }, "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ @@ -21,7 +19,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_furnace", + "id": "mineralogy:tuff_smooth_furnace", "count": 1 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json index 2da309fdf..6d663e7fa 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -16,7 +14,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_slab", + "id": "mineralogy:tuff_smooth_slab", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json index 8dafad861..1e01d5f6a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_stairs", + "id": "mineralogy:tuff_smooth_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json index c44d70fa7..7d0d82c7a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:tuff_smooth_wall", + "id": "mineralogy:tuff_smooth_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json index 87927a070..415509912 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -18,7 +16,7 @@ } }, "result": { - "item": "mineralogy:tuff_stairs", + "id": "mineralogy:tuff_stairs", "count": 4 }, "show_notification": true diff --git a/src/main/resources/data/mineralogy/recipes/tuff_to_stone.json b/src/main/resources/data/mineralogy/recipes/tuff_to_stone.json index 2b58e841e..82a6e007b 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_to_stone.json @@ -4,7 +4,9 @@ "ingredient": { "item": "mineralogy:tuff" }, - "result": "minecraft:stone", + "result": { + "id": "minecraft:stone" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_wall.json index 2e62f74a2..6b24485da 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_wall.json @@ -1,10 +1,8 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - } - ], + "forge:condition": { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, "type": "minecraft:crafting_shaped", "category": "building", "pattern": [ @@ -17,7 +15,7 @@ } }, "result": { - "item": "mineralogy:tuff_wall", + "id": "mineralogy:tuff_wall", "count": 6 }, "show_notification": true diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 612b71bed..4411722ad 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,6 @@ { "pack": { "description": "mineralogy resources", - "pack_format": 15, - "forge:resource_pack_format": 15, - "forge:data_pack_format": 15 + "pack_format": 32 } } diff --git a/src/oilCompatibilityTest/java/zone/moddev/mc/mineralogy/fixture/HistoricalOilCompatibilityProbe.java b/src/oilCompatibilityTest/java/zone/moddev/mc/mineralogy/fixture/HistoricalOilCompatibilityProbe.java index 6163f9210..83a573432 100644 --- a/src/oilCompatibilityTest/java/zone/moddev/mc/mineralogy/fixture/HistoricalOilCompatibilityProbe.java +++ b/src/oilCompatibilityTest/java/zone/moddev/mc/mineralogy/fixture/HistoricalOilCompatibilityProbe.java @@ -65,8 +65,8 @@ public final class HistoricalOilCompatibilityProbe { () -> new BucketItem(HistoricalOilCompatibilityProbe::source, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))); - public HistoricalOilCompatibilityProbe() { - IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); + public HistoricalOilCompatibilityProbe(FMLJavaModLoadingContext context) { + IEventBus modBus = context.getModEventBus(); FLUID_TYPES.register(modBus); FLUIDS.register(modBus); BLOCKS.register(modBus); @@ -80,9 +80,9 @@ private void serverStarted(ServerStartedEvent event) { Item mineralogyBucket = requireItem("mineralogy", "crude_oil_bucket"); Item historicalBucket = requireItem(MODID, "crude_oil_bucket"); TagKey oilTag = TagKey.create(Registries.FLUID, - new ResourceLocation("forge", "crude_oil")); + ResourceLocation.fromNamespaceAndPath("forge", "crude_oil")); TagKey bucketTag = TagKey.create(Registries.ITEM, - new ResourceLocation("forge", "buckets/crude_oil")); + ResourceLocation.fromNamespaceAndPath("forge", "buckets/crude_oil")); boolean distinctFluids = mineralogy != historical; boolean distinctBuckets = mineralogyBucket != historicalBucket; @@ -111,7 +111,8 @@ private void serverStarted(ServerStartedEvent event) { } private static Fluid requireFluid(String namespace, String path) { - Fluid result = ForgeRegistries.FLUIDS.getValue(new ResourceLocation(namespace, path)); + Fluid result = ForgeRegistries.FLUIDS.getValue( + ResourceLocation.fromNamespaceAndPath(namespace, path)); if (result == null) { throw new IllegalStateException("Missing fluid " + namespace + ':' + path); } @@ -119,7 +120,8 @@ private static Fluid requireFluid(String namespace, String path) { } private static Item requireItem(String namespace, String path) { - Item result = ForgeRegistries.ITEMS.getValue(new ResourceLocation(namespace, path)); + Item result = ForgeRegistries.ITEMS.getValue( + ResourceLocation.fromNamespaceAndPath(namespace, path)); if (result == null) { throw new IllegalStateException("Missing item " + namespace + ':' + path); } diff --git a/src/oilCompatibilityTest/resources/META-INF/mods.toml b/src/oilCompatibilityTest/resources/META-INF/mods.toml index e15bc9a53..28b2fcd71 100644 --- a/src/oilCompatibilityTest/resources/META-INF/mods.toml +++ b/src/oilCompatibilityTest/resources/META-INF/mods.toml @@ -11,13 +11,13 @@ description='''Disposable runtime fixture for Mineralogy crude-oil coexistence v [[dependencies.poweradvantage]] modId="forge" mandatory=true -versionRange="[47.4.10,48)" +versionRange="[50.2.0,51)" ordering="NONE" side="BOTH" [[dependencies.poweradvantage]] modId="mineralogy" mandatory=true -versionRange="[6.1.1.120011]" +versionRange="[6.1.1.120061]" ordering="AFTER" side="BOTH" diff --git a/src/oilCompatibilityTest/resources/pack.mcmeta b/src/oilCompatibilityTest/resources/pack.mcmeta index 382432301..34e798d7f 100644 --- a/src/oilCompatibilityTest/resources/pack.mcmeta +++ b/src/oilCompatibilityTest/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "Disposable historical crude-oil compatibility fixture", - "pack_format": 15 + "description": "Mineralogy historical oil compatibility fixture", + "pack_format": 32 } } diff --git a/src/recipeIntegrationTest/java/zone/moddev/mc/mineralogy/fixture/RecipeIntegrationProbe.java b/src/recipeIntegrationTest/java/zone/moddev/mc/mineralogy/fixture/RecipeIntegrationProbe.java new file mode 100644 index 000000000..e8105aec8 --- /dev/null +++ b/src/recipeIntegrationTest/java/zone/moddev/mc/mineralogy/fixture/RecipeIntegrationProbe.java @@ -0,0 +1,349 @@ +package zone.moddev.mc.mineralogy.fixture; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.SimpleContainer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.inventory.TransientCraftingContainer; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.CraftingRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; +import net.minecraft.world.item.crafting.StonecutterRecipe; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.server.ServerStartedEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ForgeRegistries; + +/** Exact-loader probe for generated recipe and advancement data. */ +@Mod(RecipeIntegrationProbe.MODID) +public final class RecipeIntegrationProbe { + public static final String MODID = "mineralogyrecipeprobe"; + + private static final String[] RECIPE_NAMES = { + "furnace", "brewing_stand", "lever", "piston", "dispenser", "dropper", + "observer", "mossy_cobblestone_from_vine", + "mossy_cobblestone_from_moss_block", "andesite", "diorite", "stone_axe", + "stone_hoe", "stone_pickaxe", "stone_shovel", "stone_sword", + "coast_armor_trim_smithing_template", "sentry_armor_trim_smithing_template", + "vex_armor_trim_smithing_template" + }; + + private static final String[] LEGACY_ROCKS = { + "andesite", "basalt", "diorite", "granite", "rhyolite", "pegmatite", + "diabase", "gabbro", "peridotite", "basaltic_glass", "scoria", "tuff", + "shale", "conglomerate", "dolomite", "limestone", "siltstone", "marble", + "slate", "schist", "gneiss", "phyllite", "amphibolite", "hornfels", + "quartzite", "novaculite", "rock_salt" + }; + + public RecipeIntegrationProbe() { + MinecraftForge.EVENT_BUS.addListener(this::serverStarted); + } + + private void serverStarted(ServerStartedEvent event) { + boolean enabled = Boolean.parseBoolean(System.getProperty( + "mineralogy.recipeProbe.equivalence", "true")); + Level level = event.getServer().overworld(); + Item basalt = requireItem("mineralogy", "basalt"); + + for (String name : RECIPE_NAMES) { + CraftingRecipe recipe = requireCraftingRecipe(level, name); + if (enabled) { + for (String rockName : LEGACY_ROCKS) { + Item rock = requireItem("mineralogy", rockName); + require(recipe.matches(inventory(name, rock), level), + name + " rejected mineralogy:" + rockName); + } + for (Item nativeRock : new Item[] { Blocks.BASALT.asItem(), Blocks.TUFF.asItem(), + Blocks.ANDESITE.asItem(), Blocks.DIORITE.asItem(), + Blocks.GRANITE.asItem() }) { + require(recipe.matches(inventory(name, nativeRock), level), + name + " rejected native " + ForgeRegistries.ITEMS.getKey(nativeRock)); + } + } else { + require(!recipe.matches(inventory(name, basalt), level), + name + " accepted ordinary Mineralogy basalt while disabled"); + require(recipe.matches(inventory(name, Blocks.COBBLESTONE.asItem()), level), + name + " rejected vanilla cobblestone while disabled"); + if (!isTrimTemplateRecipe(name)) { + require(recipe.matches(inventory(name, requireItem("mineralogy", "chert")), level), + name + " rejected unconditional chert"); + require(recipe.matches(inventory(name, requireItem("mineralogy", "pumice")), level), + name + " rejected unconditional pumice"); + } + } + + ItemStack result = recipe.assemble(inventory(name, + enabled ? basalt : Blocks.COBBLESTONE.asItem()), level.registryAccess()); + require(expectedOutput(name).equals(ForgeRegistries.ITEMS.getKey(result.getItem())), + name + " produced " + ForgeRegistries.ITEMS.getKey(result.getItem())); + require(result.getCount() == (isTrimTemplateRecipe(name) ? 2 : expectedCount(name)), + name + " produced count " + result.getCount()); + } + + verifySlabRoutes(level); + verifyAdvancements(event); + writeMarker(enabled); + event.getServer().halt(false); + } + + private static void verifySlabRoutes(Level level) { + for (String family : new String[] { "andesite", "diorite", "granite" }) { + Item nativeRock = requireItem("minecraft", family); + CraftingRecipe slab = requireCraftingRecipe(level, family + "_slab"); + CraftingContainer slabInput = shaped(new String[] { "###" }, Map.of('#', nativeRock)); + require(slab.matches(slabInput, level), family + " slab override does not match"); + require(ResourceLocation.fromNamespaceAndPath("mineralogy", family + "_slab").equals( + ForgeRegistries.ITEMS.getKey(slab.assemble(slabInput, level.registryAccess()).getItem())), + family + " slab override did not produce Mineralogy's slab"); + + assertBridge(level, family + "_slab_to_vanilla", + requireItem("mineralogy", family + "_slab"), + requireItem("minecraft", family + "_slab")); + assertBridge(level, family + "_slab_from_vanilla", + requireItem("minecraft", family + "_slab"), + requireItem("mineralogy", family + "_slab")); + assertBridge(level, family + "_smooth_slab_to_vanilla", + requireItem("mineralogy", family + "_smooth_slab"), + requireItem("minecraft", "polished_" + family + "_slab")); + assertBridge(level, family + "_smooth_slab_from_vanilla", + requireItem("minecraft", "polished_" + family + "_slab"), + requireItem("mineralogy", family + "_smooth_slab")); + + assertStonecutting(level, family + "_slab_from_" + family + "_stonecutting", + nativeRock, requireItem("mineralogy", family + "_slab")); + assertStonecutting(level, "polished_" + family + "_slab_from_" + family + + "_stonecutting", nativeRock, + requireItem("mineralogy", family + "_smooth_slab")); + assertStonecutting(level, "polished_" + family + "_slab_from_polished_" + + family + "_stonecutting", requireItem("minecraft", "polished_" + family), + requireItem("mineralogy", family + "_smooth_slab")); + } + } + + private static void assertStonecutting(Level level, String name, Item source, Item expected) { + RecipeHolder holder = level.getRecipeManager().byKey( + ResourceLocation.fromNamespaceAndPath("minecraft", name)).orElseThrow(() -> + new IllegalStateException("Missing loaded stonecutting recipe minecraft:" + name)); + require(holder.value() instanceof StonecutterRecipe, + "minecraft:" + name + " is not a stonecutting recipe"); + StonecutterRecipe recipe = (StonecutterRecipe) holder.value(); + SimpleContainer input = new SimpleContainer(new ItemStack(source)); + require(recipe.matches(input, level), name + " does not match its native source"); + ItemStack output = recipe.assemble(input, level.registryAccess()); + require(output.getItem() == expected && output.getCount() == 2, + name + " did not produce two matching Mineralogy slabs"); + } + + private static void assertBridge(Level level, String name, Item source, Item expected) { + CraftingRecipe recipe = requireCraftingRecipe(level, name, "mineralogy"); + CraftingContainer input = shapeless(source); + require(recipe.matches(input, level), name + " does not match its exact source"); + ItemStack output = recipe.assemble(input, level.registryAccess()); + require(output.getItem() == expected && output.getCount() == 1, + name + " did not produce its exact one-for-one result"); + } + + private static void verifyAdvancements(ServerStartedEvent event) { + for (String name : RECIPE_NAMES) { + if (isTrimTemplateRecipe(name)) continue; + String category = advancementCategory(name); + ResourceLocation id = ResourceLocation.fromNamespaceAndPath( + "minecraft", "recipes/" + category + "/" + name); + require(event.getServer().getAdvancements().get(id) != null, + "Missing loaded advancement " + id); + } + for (String id : new String[] { "basalt_slab", "basalt_smooth_stairs", + "basalt_furnace", "basalt_relief_blank", "basalt_relief_pickaxe" }) { + ResourceLocation advancement = ResourceLocation.fromNamespaceAndPath( + "mineralogy", "recipes/" + id); + require(event.getServer().getAdvancements().get(advancement) != null, + "Missing progressive advancement " + advancement); + } + } + + private static CraftingRecipe requireCraftingRecipe(Level level, String name) { + return requireCraftingRecipe(level, name, "minecraft"); + } + + private static CraftingRecipe requireCraftingRecipe(Level level, String name, String namespace) { + RecipeHolder holder = level.getRecipeManager().byKey( + ResourceLocation.fromNamespaceAndPath(namespace, name)).orElseThrow(() -> + new IllegalStateException("Missing loaded recipe " + namespace + ':' + name)); + require(holder.value() instanceof CraftingRecipe, + namespace + ':' + name + " is not a crafting recipe"); + return (CraftingRecipe) holder.value(); + } + + private static CraftingContainer inventory(String name, Item rock) { + if ("mossy_cobblestone_from_vine".equals(name)) return shapeless(rock, Blocks.VINE.asItem()); + if ("mossy_cobblestone_from_moss_block".equals(name)) { + return shapeless(rock, Blocks.MOSS_BLOCK.asItem()); + } + if ("andesite".equals(name)) return shapeless(Blocks.DIORITE.asItem(), rock); + if (isTrimTemplateRecipe(name)) { + Item template = "coast_armor_trim_smithing_template".equals(name) + ? Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE + : "sentry_armor_trim_smithing_template".equals(name) + ? Items.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE + : Items.VEX_ARMOR_TRIM_SMITHING_TEMPLATE; + return shaped(new String[] { "#S#", "#C#", "###" }, + Map.of('#', Items.DIAMOND, 'S', template, 'C', rock)); + } + + Map ingredients = new LinkedHashMap<>(); + ingredients.put('#', rock); + String[] pattern; + switch (name) { + case "furnace" -> pattern = new String[] { "###", "# #", "###" }; + case "brewing_stand" -> { + pattern = new String[] { " B ", "###" }; + ingredients.put('B', Items.BLAZE_ROD); + } + case "lever" -> { + pattern = new String[] { "X", "#" }; + ingredients.put('X', Items.STICK); + } + case "piston" -> { + pattern = new String[] { "TTT", "#X#", "#R#" }; + ingredients.put('T', Blocks.OAK_PLANKS.asItem()); + ingredients.put('X', Items.IRON_INGOT); + ingredients.put('R', Items.REDSTONE); + } + case "dispenser" -> { + pattern = new String[] { "###", "#X#", "#R#" }; + ingredients.put('X', Items.BOW); + ingredients.put('R', Items.REDSTONE); + } + case "dropper" -> { + pattern = new String[] { "###", "# #", "#R#" }; + ingredients.put('R', Items.REDSTONE); + } + case "observer" -> { + pattern = new String[] { "###", "RRQ", "###" }; + ingredients.put('R', Items.REDSTONE); + ingredients.put('Q', Items.QUARTZ); + } + case "diorite" -> { + pattern = new String[] { "CQ", "QC" }; + ingredients.put('C', rock); + ingredients.put('Q', Items.QUARTZ); + } + case "stone_axe" -> { + pattern = new String[] { "XX", "X#", " #" }; + ingredients.put('X', rock); + ingredients.put('#', Items.STICK); + } + case "stone_hoe" -> { + pattern = new String[] { "XX", " #", " #" }; + ingredients.put('X', rock); + ingredients.put('#', Items.STICK); + } + case "stone_pickaxe" -> { + pattern = new String[] { "XXX", " # ", " # " }; + ingredients.put('X', rock); + ingredients.put('#', Items.STICK); + } + case "stone_shovel" -> { + pattern = new String[] { "X", "#", "#" }; + ingredients.put('X', rock); + ingredients.put('#', Items.STICK); + } + case "stone_sword" -> { + pattern = new String[] { "X", "X", "#" }; + ingredients.put('X', rock); + ingredients.put('#', Items.STICK); + } + default -> throw new IllegalArgumentException(name); + } + return shaped(pattern, ingredients); + } + + private static CraftingContainer shaped(String[] pattern, Map ingredients) { + CraftingContainer inventory = new TransientCraftingContainer(dummyContainer(), 3, 3); + for (int row = 0; row < pattern.length; row++) { + for (int column = 0; column < pattern[row].length(); column++) { + Item item = ingredients.get(pattern[row].charAt(column)); + if (item != null) inventory.setItem(row * 3 + column, new ItemStack(item)); + } + } + return inventory; + } + + private static CraftingContainer shapeless(Item... items) { + CraftingContainer inventory = new TransientCraftingContainer(dummyContainer(), 3, 3); + for (int index = 0; index < items.length; index++) { + inventory.setItem(index, new ItemStack(items[index])); + } + return inventory; + } + + private static AbstractContainerMenu dummyContainer() { + return new AbstractContainerMenu(null, -1) { + @Override public ItemStack quickMoveStack(Player player, int index) { return ItemStack.EMPTY; } + @Override public boolean stillValid(Player player) { return false; } + }; + } + + private static Item requireItem(String namespace, String path) { + Item result = ForgeRegistries.ITEMS.getValue( + ResourceLocation.fromNamespaceAndPath(namespace, path)); + if (result == null) throw new IllegalStateException("Missing item " + namespace + ':' + path); + return result; + } + + private static ResourceLocation expectedOutput(String name) { + String path = name.startsWith("mossy_cobblestone_from_") ? "mossy_cobblestone" : name; + return ResourceLocation.fromNamespaceAndPath("minecraft", path); + } + + private static int expectedCount(String name) { + return "andesite".equals(name) || "diorite".equals(name) ? 2 : 1; + } + + private static boolean isTrimTemplateRecipe(String name) { + return name.endsWith("_armor_trim_smithing_template"); + } + + private static String advancementCategory(String name) { + if ("furnace".equals(name)) return "decorations"; + if ("brewing_stand".equals(name)) return "brewing"; + if (name.startsWith("stone_")) return "stone_sword".equals(name) ? "combat" : "tools"; + if ("andesite".equals(name) || "diorite".equals(name) + || name.startsWith("mossy_cobblestone")) return "building_blocks"; + return "redstone"; + } + + private static void writeMarker(boolean enabled) { + String result = "forge_recipe_manager_loaded=true\n" + + "equivalence_enabled=" + enabled + "\n" + + "covered_vanilla_recipes=19\n" + + "legacy_rock_families=27\n" + + "native_rock_aliases=5\n" + + "shared_stonecutting_routes=9\n" + + "slab_bridges=12\n" + + "progressive_advancements_loaded=true\n"; + try { + Files.writeString(Path.of("recipe-integration-pass.properties"), result, + StandardCharsets.UTF_8); + } catch (IOException exception) { + throw new IllegalStateException("Could not write recipe integration marker", exception); + } + } + + private static void require(boolean condition, String message) { + if (!condition) throw new IllegalStateException(message); + } +} diff --git a/src/recipeIntegrationTest/java/zone/moddev/mc/mineralogy/recipeprobe/RegionPaletteAudit.java b/src/recipeIntegrationTest/java/zone/moddev/mc/mineralogy/recipeprobe/RegionPaletteAudit.java new file mode 100644 index 000000000..58c3634f6 --- /dev/null +++ b/src/recipeIntegrationTest/java/zone/moddev/mc/mineralogy/recipeprobe/RegionPaletteAudit.java @@ -0,0 +1,273 @@ +package zone.moddev.mc.mineralogy.recipeprobe; + +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.RandomAccessFile; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.zip.GZIPInputStream; +import java.util.zip.InflaterInputStream; + +import com.google.gson.GsonBuilder; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.NbtAccounter; +import net.minecraft.nbt.NbtIo; +import net.minecraft.nbt.Tag; + +/** + * Build-only reader for the block-state palettes in disposable Anvil worlds. + * It deliberately lives beside the loader recipe probe so it cannot enter a + * production source set or release artifact. + */ +public final class RegionPaletteAudit { + private static final int SECTOR_BYTES = 4096; + private static final int LOCATION_COUNT = 1024; + + private RegionPaletteAudit() { + } + + public static void main(String[] arguments) throws Exception { + if (arguments.length != 3) { + throw new IllegalArgumentException("Expected: "); + } + Path regionDirectory = Path.of(arguments[0]).toAbsolutePath().normalize(); + Path output = Path.of(arguments[1]).toAbsolutePath().normalize(); + if (!Files.isDirectory(regionDirectory)) { + throw new IllegalArgumentException("Region directory does not exist: " + regionDirectory); + } + + Map targets = new LinkedHashMap<>(); + for (String target : arguments[2].split(";")) { + String trimmed = target.trim(); + if (!trimmed.isEmpty()) targets.put(trimmed, 0L); + } + + Audit audit = new Audit(targets); + try (var paths = Files.list(regionDirectory)) { + for (Path path : paths.filter(candidate -> candidate.getFileName().toString().endsWith(".mca")).sorted().toList()) { + audit.regions++; + auditRegion(path, audit); + } + } + + Map result = new LinkedHashMap<>(); + result.put("region_directory", regionDirectory.toString()); + result.put("regions", audit.regions); + result.put("chunks", audit.chunks); + result.put("palette_entries", audit.paletteEntries); + result.put("targets", audit.targets); + result.put("oil_blocks", audit.oilBlocks); + result.put("oil_min_y", audit.oilBlocks == 0L ? null : audit.oilMinY); + result.put("oil_max_y", audit.oilBlocks == 0L ? null : audit.oilMaxY); + result.put("oil_columns", audit.oilColumns); + result.put("oil_columns_with_two_solid_blocks_above", audit.coveredOilColumns); + result.put("oil_columns_without_two_solid_blocks_above", audit.uncoveredOilColumns); + result.put("missing", audit.targets.entrySet().stream() + .filter(entry -> entry.getValue() == 0L).map(Map.Entry::getKey).toList()); + result.put("mineralogy_entries", new TreeMap<>(audit.mineralogyEntries)); + result.put("rock_furnaces", audit.rockFurnaces); + Files.createDirectories(output.getParent()); + Files.writeString(output, + new GsonBuilder().setPrettyPrinting().create().toJson(result) + System.lineSeparator(), + StandardCharsets.UTF_8); + System.out.println("MINERALOGY_REGION_AUDIT regions=" + audit.regions + " chunks=" + audit.chunks + + " targets=" + audit.targets + " output=" + output); + } + + private static void auditRegion(Path path, Audit audit) throws IOException { + try (RandomAccessFile region = new RandomAccessFile(path.toFile(), "r")) { + if (region.length() < SECTOR_BYTES * 2L) return; + for (int index = 0; index < LOCATION_COUNT; index++) { + region.seek(index * 4L); + int location = region.readInt(); + int sectorOffset = location >>> 8; + int sectorCount = location & 0xFF; + if (sectorOffset == 0 || sectorCount == 0) continue; + long byteOffset = sectorOffset * (long) SECTOR_BYTES; + if (byteOffset + 5L > region.length()) continue; + region.seek(byteOffset); + int length = region.readInt(); + if (length <= 1 || length > sectorCount * SECTOR_BYTES - 4) { + throw new IOException("Invalid chunk length " + length + " in " + path + " at index " + index); + } + int compression = region.readUnsignedByte(); + if ((compression & 0x80) != 0) { + throw new IOException("External chunk streams are not supported by this bounded audit: " + path); + } + byte[] payload = new byte[length - 1]; + region.readFully(payload); + try (InputStream compressed = new ByteArrayInputStream(payload); + InputStream decoded = decompress(compression, compressed); + DataInputStream input = new DataInputStream(decoded)) { + auditChunk(NbtIo.read(input, NbtAccounter.unlimitedHeap()), audit); + } + } + } + } + + private static InputStream decompress(int compression, InputStream input) throws IOException { + return switch (compression) { + case 1 -> new GZIPInputStream(input); + case 2 -> new InflaterInputStream(input); + case 3 -> input; + default -> throw new IOException("Unsupported region compression type " + compression); + }; + } + + private static void auditChunk(CompoundTag chunk, Audit audit) { + audit.chunks++; + ListTag sections = chunk.getList("sections", Tag.TAG_COMPOUND); + Map sectionsByY = new HashMap<>(); + boolean containsOil = false; + for (int sectionIndex = 0; sectionIndex < sections.size(); sectionIndex++) { + CompoundTag section = sections.getCompound(sectionIndex); + sectionsByY.put((int) section.getByte("Y"), section); + CompoundTag blockStates = section.getCompound("block_states"); + ListTag palette = blockStates.getList("palette", Tag.TAG_COMPOUND); + for (int paletteIndex = 0; paletteIndex < palette.size(); paletteIndex++) { + String name = palette.getCompound(paletteIndex).getString("Name"); + containsOil |= "mineralogy:crude_oil".equals(name); + audit.paletteEntries++; + if (audit.targets.containsKey(name)) audit.targets.merge(name, 1L, Long::sum); + if (name.startsWith("mineralogy:")) audit.mineralogyEntries.merge(name, 1L, Long::sum); + } + } + if (containsOil) auditOilCover(sectionsByY, audit); + auditRockFurnaces(chunk.getList("block_entities", Tag.TAG_COMPOUND), audit); + } + + private static void auditRockFurnaces(ListTag blockEntities, Audit audit) { + for (int index = 0; index < blockEntities.size(); index++) { + CompoundTag blockEntity = blockEntities.getCompound(index); + if (!"mineralogy:rock_furnace".equals(blockEntity.getString("id"))) continue; + Map furnace = new LinkedHashMap<>(); + furnace.put("id", blockEntity.getString("id")); + furnace.put("x", blockEntity.getInt("x")); + furnace.put("y", blockEntity.getInt("y")); + furnace.put("z", blockEntity.getInt("z")); + furnace.put("burn_time", numericValue(blockEntity, "BurnTime", "burn_time")); + furnace.put("cook_time", numericValue(blockEntity, "CookTime", "cook_time")); + furnace.put("cook_total", numericValue(blockEntity, "CookTimeTotal", "cook_time_total")); + List> items = new ArrayList<>(); + ListTag itemTags = blockEntity.getList("Items", Tag.TAG_COMPOUND); + for (int itemIndex = 0; itemIndex < itemTags.size(); itemIndex++) { + CompoundTag item = itemTags.getCompound(itemIndex); + Map value = new LinkedHashMap<>(); + value.put("slot", numericValue(item, "Slot", "slot")); + value.put("id", item.getString("id")); + value.put("count", numericValue(item, "Count", "count")); + items.add(value); + } + furnace.put("items", items); + audit.rockFurnaces.add(furnace); + } + } + + private static int numericValue(CompoundTag tag, String legacyName, String currentName) { + return tag.contains(currentName, Tag.TAG_ANY_NUMERIC) ? tag.getInt(currentName) : tag.getInt(legacyName); + } + + private static void auditOilCover(Map sectionsByY, Audit audit) { + Map decoded = new HashMap<>(); + for (Map.Entry entry : sectionsByY.entrySet()) { + decoded.put(entry.getKey(), decodeSection(entry.getValue().getCompound("block_states"))); + } + Map highestOilByColumn = new HashMap<>(); + for (Map.Entry entry : decoded.entrySet()) { + int sectionY = entry.getKey(); + String[] states = entry.getValue(); + for (int index = 0; index < states.length; index++) { + if (!"mineralogy:crude_oil".equals(states[index])) continue; + int localX = index & 15; + int localZ = (index >>> 4) & 15; + int localY = index >>> 8; + int y = sectionY * 16 + localY; + int column = (localZ << 4) | localX; + highestOilByColumn.merge(column, y, Math::max); + audit.oilBlocks++; + audit.oilMinY = Math.min(audit.oilMinY, y); + audit.oilMaxY = Math.max(audit.oilMaxY, y); + } + } + for (Map.Entry entry : highestOilByColumn.entrySet()) { + int localX = entry.getKey() & 15; + int localZ = (entry.getKey() >>> 4) & 15; + int topOilY = entry.getValue(); + audit.oilColumns++; + if (isSolidCover(blockAt(decoded, localX, topOilY + 1, localZ)) + && isSolidCover(blockAt(decoded, localX, topOilY + 2, localZ))) { + audit.coveredOilColumns++; + } else { + audit.uncoveredOilColumns++; + } + } + } + + private static String[] decodeSection(CompoundTag blockStates) { + ListTag palette = blockStates.getList("palette", Tag.TAG_COMPOUND); + String[] names = new String[palette.size()]; + for (int index = 0; index < palette.size(); index++) { + names[index] = palette.getCompound(index).getString("Name"); + } + String[] states = new String[4096]; + if (names.length == 0) return states; + if (names.length == 1 || !blockStates.contains("data", Tag.TAG_LONG_ARRAY)) { + java.util.Arrays.fill(states, names[0]); + return states; + } + int bits = Math.max(4, 32 - Integer.numberOfLeadingZeros(names.length - 1)); + int valuesPerLong = 64 / bits; + long mask = (1L << bits) - 1L; + long[] data = blockStates.getLongArray("data"); + for (int index = 0; index < states.length; index++) { + int longIndex = index / valuesPerLong; + if (longIndex >= data.length) break; + int paletteIndex = (int) ((data[longIndex] >>> ((index % valuesPerLong) * bits)) & mask); + if (paletteIndex < names.length) states[index] = names[paletteIndex]; + } + return states; + } + + private static String blockAt(Map decoded, int x, int y, int z) { + int sectionY = Math.floorDiv(y, 16); + String[] states = decoded.get(sectionY); + if (states == null) return "minecraft:air"; + int localY = Math.floorMod(y, 16); + return states[(localY << 8) | (z << 4) | x]; + } + + private static boolean isSolidCover(String block) { + return block != null && !block.equals("minecraft:air") && !block.equals("minecraft:cave_air") + && !block.equals("minecraft:void_air") && !block.equals("minecraft:water") + && !block.equals("minecraft:lava") && !block.equals("mineralogy:crude_oil"); + } + + private static final class Audit { + private final Map targets; + private final Map mineralogyEntries = new LinkedHashMap<>(); + private final List> rockFurnaces = new ArrayList<>(); + private int regions; + private long chunks; + private long paletteEntries; + private long oilBlocks; + private int oilMinY = Integer.MAX_VALUE; + private int oilMaxY = Integer.MIN_VALUE; + private long oilColumns; + private long coveredOilColumns; + private long uncoveredOilColumns; + + private Audit(Map targets) { + this.targets = targets; + } + } +} diff --git a/src/recipeIntegrationTest/resources/META-INF/mods.toml b/src/recipeIntegrationTest/resources/META-INF/mods.toml new file mode 100644 index 000000000..5d3c4434e --- /dev/null +++ b/src/recipeIntegrationTest/resources/META-INF/mods.toml @@ -0,0 +1,22 @@ +modLoader="javafml" +loaderVersion="[50,)" +license="LGPL-2.1-only" + +[[mods]] +modId="mineralogyrecipeprobe" +version="1" +displayName="Mineralogy Recipe Integration Probe" + +[[dependencies.mineralogyrecipeprobe]] +modId="forge" +mandatory=true +versionRange="[50.2.0,51)" +ordering="NONE" +side="BOTH" + +[[dependencies.mineralogyrecipeprobe]] +modId="mineralogy" +mandatory=true +versionRange="[6.1.1.120061]" +ordering="AFTER" +side="BOTH" diff --git a/src/recipeIntegrationTest/resources/pack.mcmeta b/src/recipeIntegrationTest/resources/pack.mcmeta new file mode 100644 index 000000000..cc042a223 --- /dev/null +++ b/src/recipeIntegrationTest/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Mineralogy recipe integration fixture", + "pack_format": 32 + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java b/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java index 77c689660..73c01201c 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java @@ -343,7 +343,7 @@ public void documentationExportIsMissingOnlyAndCopiesExactProvider() throws Exce private static JsonObject parse(File file) throws Exception { try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { - return new JsonParser().parse(reader).getAsJsonObject(); + return JsonParser.parseReader(reader).getAsJsonObject(); } } diff --git a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java index 3b34f6d18..b3c7380ec 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java @@ -119,7 +119,7 @@ public void optionalGunpowderDustsCannotCollapseToTwoIngredients() throws Except } @Test - public void forge40OilUsesNativeFlowingFluidRendering() throws Exception { + public void forge50UsesModelBlockLayersAndNativeFlowingFluidRendering() throws Exception { String fluid = text("src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java"); assertTrue(fluid.contains("ForgeFlowingFluid.Source")); assertTrue(fluid.contains("ForgeFlowingFluid.Flowing")); @@ -130,6 +130,12 @@ public void forge40OilUsesNativeFlowingFluidRendering() throws Exception { String client = text("src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java"); assertTrue(client.contains("ItemBlockRenderTypes.setRenderLayer(MineralogyFluids.CRUDE_OIL.get()")); assertTrue(client.contains("RenderType.translucent()")); + assertFalse(client.contains("setRenderLayer(block")); + for (String model : new String[] { "pane_n", "pane_ne", "pane_ns", "pane_nse", "pane_nsew", + "rocksaltlamp", "rocksaltlamp_down", "rocksaltlamp_wall", "rocksaltstreetlamp" }) { + assertTrue(text("src/main/resources/assets/mineralogy/models/block/" + model + ".json") + .contains("\"render_type\": \"cutout\"")); + } assertFalse(new File("src/main/java/zone/moddev/mc/mineralogy/client/ClientOilRenderer.java").exists()); } @@ -166,8 +172,10 @@ public void legacyFlatteningUsesTheExpandedArrayAndReinstallsTheSelectedWorldMap assertTrue(hook.contains("type.getComponentType() != Dynamic.class")); assertTrue(hook.contains("legacyStates[stateId] = BlockStateData.parse(stateNbt)")); assertTrue(hook.contains("unsafe.putObjectVolatile(base, offset, expanded)")); - assertTrue(hook.contains("captureLegacyLevelData(CompoundTag root,")); + assertTrue(hook.contains("captureLegacyLevelData(LevelStorageSource.LevelStorageAccess access,")); assertTrue(hook.contains("LevelStorageSource.LevelDirectory levelDirectory)")); + assertTrue(hook.contains("access.getDataTagRaw(false)")); + assertTrue(hook.contains("access.getDataTagRaw(true)")); String transformer = text("src/main/resources/coremods/mineralogy_legacy_world_fix.js"); assertTrue(transformer.contains("net/minecraft/world/level/storage/LevelStorageSource$LevelDirectory")); assertTrue(hook.contains("writeSidecar(levelDat.getParentFile(), blocks)")); diff --git a/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java index 7b2724cc5..f5271650f 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.*; -/** Quality policy for the reviewed 1.20.1 JSON localization inventory. */ +/** Quality policy for the reviewed 1.20.6 JSON localization inventory. */ public class LocalizationQualityTest { private static final File LANG_DIR = new File("src/main/resources/assets/mineralogy/lang"); private static final Set ENGLISH_LOCALES = new HashSet(Arrays.asList( @@ -166,7 +166,7 @@ private static List formatArguments(String value) { private static Map read(File file) throws Exception { JsonObject object; try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { - object = new JsonParser().parse(reader).getAsJsonObject(); + object = JsonParser.parseReader(reader).getAsJsonObject(); } Map values = new LinkedHashMap(); for (Map.Entry entry : object.entrySet()) { diff --git a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java index f515a0b2c..a9286259b 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java @@ -2,385 +2,202 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; import java.io.Reader; -import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Path; import java.util.Arrays; -import java.util.ArrayList; -import java.util.IdentityHashMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; +import java.util.Set; +import org.junit.Test; + +import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import net.minecraft.core.Holder; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; -import net.minecraft.SharedConstants; -import net.minecraft.server.Bootstrap; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagKey; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.CraftingContainer; -import net.minecraft.world.inventory.TransientCraftingContainer; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.CraftingRecipe; -import net.minecraft.world.item.crafting.Recipe; -import net.minecraft.world.item.crafting.RecipeManager; -import net.minecraft.world.level.block.Blocks; -import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.common.crafting.VanillaIngredientSerializer; -import net.minecraftforge.common.crafting.conditions.NotCondition; -import net.minecraftforge.common.crafting.conditions.ICondition; - -import org.junit.BeforeClass; -import org.junit.Test; - -/** Exercises generated overrides through Forge conditions and Minecraft's recipe deserializers. */ +/** + * Checks generated recipe branches before the loader-side recipe-manager smoke. + * Forge 50's component and condition registries are deliberately unavailable to + * a plain JUnit VM, so real codec loading and matching are exercised in Forge. + */ public class NativeRecipeManagerTest { private static final File RECIPE_ROOT = new File("src/main/resources/data/minecraft/recipes"); private static final File MINERALOGY_RECIPE_ROOT = new File( "src/main/resources/data/mineralogy/recipes"); - @BeforeClass - public static void initializeRegistriesAndConditions() { - SharedConstants.tryDetectVersion(); - bootstrapRegistriesWithoutForgeNetworkInitialization(); - CraftingHelper.register(NotCondition.Serializer.INSTANCE); - CraftingHelper.register(new ResourceLocation("minecraft", "item"), - VanillaIngredientSerializer.INSTANCE); - MineralogyConfig.registerRecipeConditions(); - } - - private static void bootstrapRegistriesWithoutForgeNetworkInitialization() { - try { - Field field = Bootstrap.class.getDeclaredField("isBootstrapped"); - field.setAccessible(true); - if (!field.getBoolean(null)) { - field.setBoolean(null, true); - BuiltInRegistries.bootStrap(); - } - } catch (ReflectiveOperationException exception) { - throw new AssertionError("Unable to initialize the isolated recipe registry", exception); - } - } @Test - public void enabledNativeAndLegacyFamilyRepresentativesMatchEveryCoveredVanillaRecipe() + public void enabledBranchesUseExpandedMaterialsForEveryCoveredVanillaRecipe() throws Exception { - Map, List>> previous = snapshotItemTags(); - try { - installRecipeTags(); - loadConfig(true); - for (Item rock : ordinaryRockInputs()) { - for (String recipeName : recipeNames()) { - CraftingRecipe recipe = recipe(recipeName); - CraftingContainer inventory = inventory(recipeName, rock); - assertTrue(recipeName + " with " + BuiltInRegistries.ITEM.getKey(rock), - recipe.matches(inventory, null)); - String expectedOutput = recipeName.startsWith("mossy_cobblestone_from_") - ? "minecraft:mossy_cobblestone" : "minecraft:" + recipeName; - assertEquals(recipeName, expectedOutput, - BuiltInRegistries.ITEM.getKey( - recipe.getResultItem(RegistryAccess.EMPTY).getItem()).toString()); - if (isTrimTemplateRecipe(recipeName)) { - assertEquals(recipeName, 2, - recipe.getResultItem(RegistryAccess.EMPTY).getCount()); - } - } - } - } finally { - BuiltInRegistries.ITEM.bindTags(previous); + for (String name : recipeNames()) { + JsonObject recipe = selectedRecipe(json(new File(RECIPE_ROOT, name + ".json")), true); + assertNotNull(name, recipe); + assertTrue(name, containsIngredient(recipe, enabledMaterial(name))); + assertEquals(name, expectedOutput(name), recipe.getAsJsonObject("result") + .get("id").getAsString()); + assertEquals(name, isTrimTemplateRecipe(name) ? 2 : expectedCount(name), + resultCount(recipe)); } } @Test - public void disabledEquivalenceRejectsOrdinaryFamiliesButKeepsVanillaChertAndPumice() - throws Exception { - Map, List>> previous = snapshotItemTags(); - try { - installRecipeTags(); - loadConfig(false); - for (String recipeName : recipeNames()) { - CraftingRecipe recipe = recipe(recipeName); - for (Item rock : ordinaryRockInputs()) { - assertFalse(recipeName + " with " + BuiltInRegistries.ITEM.getKey(rock), - recipe.matches(inventory(recipeName, rock), null)); - } - assertTrue(recipeName, recipe.matches(inventory(recipeName, Blocks.COBBLESTONE.asItem()), null)); - // The three 1.20 template recipes deliberately retain exact vanilla - // cobblestone while equivalence is disabled. Other tag-backed recipes - // continue accepting always-cobblestone chert and pumice. - if (isTrimTemplateRecipe(recipeName)) { - assertFalse(recipeName + " with chert stand-in", - recipe.matches(inventory(recipeName, Blocks.NETHERRACK.asItem()), null)); - assertFalse(recipeName + " with pumice stand-in", - recipe.matches(inventory(recipeName, Blocks.END_STONE.asItem()), null)); - } else { - assertTrue(recipeName + " with chert stand-in", - recipe.matches(inventory(recipeName, Blocks.NETHERRACK.asItem()), null)); - assertTrue(recipeName + " with pumice stand-in", - recipe.matches(inventory(recipeName, Blocks.END_STONE.asItem()), null)); - } - } - assertTrue(recipe("furnace").matches(inventory("furnace", Blocks.BLACKSTONE.asItem()), null)); - assertTrue(recipe("brewing_stand").matches( - inventory("brewing_stand", Blocks.BLACKSTONE.asItem()), null)); - assertTrue(recipe("furnace").matches( - inventory("furnace", Blocks.COBBLED_DEEPSLATE.asItem()), null)); - assertTrue(recipe("stone_pickaxe").matches( - inventory("stone_pickaxe", Blocks.COBBLED_DEEPSLATE.asItem()), null)); - } finally { - BuiltInRegistries.ITEM.bindTags(previous); + public void disabledBranchesRetainExactTargetNativeMaterials() throws Exception { + for (String name : recipeNames()) { + JsonObject recipe = selectedRecipe(json(new File(RECIPE_ROOT, name + ".json")), false); + assertNotNull(name, recipe); + assertTrue(name, containsIngredient(recipe, disabledMaterial(name))); + assertFalse(name, containsIngredient(recipe, enabledMaterial(name))); + assertEquals(name, expectedOutput(name), recipe.getAsJsonObject("result") + .get("id").getAsString()); } + + assertCompositeTag("cobblestone_equivalents", "#forge:cobblestone"); + assertCompositeTag("stone_crafting_materials", "#minecraft:stone_crafting_materials"); + assertCompositeTag("stone_tool_materials", "#minecraft:stone_tool_materials"); + assertTagContains("data/forge/tags/items/cobblestone.json", + "mineralogy:chert", "mineralogy:pumice"); } @Test public void nativeAndMineralogySlabsConvertExactlyOneForOneInBothDirections() throws Exception { - Object[][] bridges = { - { "andesite_slab", Blocks.ANDESITE_SLAB.asItem() }, - { "andesite_smooth_slab", Blocks.POLISHED_ANDESITE_SLAB.asItem() }, - { "diorite_slab", Blocks.DIORITE_SLAB.asItem() }, - { "diorite_smooth_slab", Blocks.POLISHED_DIORITE_SLAB.asItem() }, - { "granite_slab", Blocks.GRANITE_SLAB.asItem() }, - { "granite_smooth_slab", Blocks.POLISHED_GRANITE_SLAB.asItem() } - }; - for (Object[] bridge : bridges) { - assertSlabConversion((String) bridge[0], (Item) bridge[1]); + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertSlabConversion(family + "_slab_to_vanilla", + "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab"); + assertSlabConversion(family + "_slab_from_vanilla", + "minecraft:" + family + "_slab", "mineralogy:" + family + "_slab"); + assertSlabConversion(family + "_smooth_slab_to_vanilla", + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + assertSlabConversion(family + "_smooth_slab_from_vanilla", + "minecraft:polished_" + family + "_slab", + "mineralogy:" + family + "_smooth_slab"); } } - private static void assertSlabConversion(String prefix, Item vanilla) + private static void assertSlabConversion(String name, String source, String result) throws Exception { - Item standIn = Blocks.COBBLESTONE.asItem(); - CraftingRecipe toVanilla = mineralogyRecipe(prefix + "_to_vanilla", standIn); - assertTrue(prefix, toVanilla.matches(shapeless(new ItemStack(standIn)), null)); - assertFalse(prefix, toVanilla.matches(shapeless(new ItemStack(vanilla)), null)); - assertEquals(prefix, vanilla, toVanilla.getResultItem(RegistryAccess.EMPTY).getItem()); - assertEquals(prefix, 1, toVanilla.getResultItem(RegistryAccess.EMPTY).getCount()); - - CraftingRecipe fromVanilla = mineralogyRecipe(prefix + "_from_vanilla", standIn); - assertTrue(prefix, fromVanilla.matches(shapeless(new ItemStack(vanilla)), null)); - assertFalse(prefix, fromVanilla.matches(shapeless(new ItemStack(standIn)), null)); - assertEquals(prefix, standIn, - fromVanilla.getResultItem(RegistryAccess.EMPTY).getItem()); - assertEquals(prefix, 1, fromVanilla.getResultItem(RegistryAccess.EMPTY).getCount()); - } - - private static void installRecipeTags() { - Map, List>> tags = snapshotItemTags(); - tags.put(tagKey("forge:cobblestone"), holders(Blocks.COBBLESTONE.asItem(), - Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem())); - tags.put(tagKey("minecraft:stone_crafting_materials"), - holders(Blocks.COBBLESTONE.asItem(), Blocks.BLACKSTONE.asItem(), - Blocks.COBBLED_DEEPSLATE.asItem(), Blocks.NETHERRACK.asItem(), - Blocks.END_STONE.asItem())); - tags.put(tagKey("minecraft:stone_tool_materials"), holders(Blocks.COBBLESTONE.asItem(), - Blocks.BLACKSTONE.asItem(), Blocks.COBBLED_DEEPSLATE.asItem(), - Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem())); - tags.put(tagKey("minecraft:planks"), holders(Blocks.OAK_PLANKS.asItem())); - tags.put(tagKey("mineralogy:cobblestone_equivalents"), - holders(Blocks.COBBLESTONE.asItem(), Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem(), - Blocks.BASALT.asItem(), Blocks.TUFF.asItem(), Blocks.ANDESITE.asItem(), - Blocks.DIORITE.asItem(), Blocks.GRANITE.asItem(), Blocks.CALCITE.asItem())); - tags.put(tagKey("mineralogy:stone_crafting_materials"), holders(Blocks.COBBLESTONE.asItem(), - Blocks.BLACKSTONE.asItem(), Blocks.COBBLED_DEEPSLATE.asItem(), - Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem(), Blocks.BASALT.asItem(), - Blocks.TUFF.asItem(), Blocks.ANDESITE.asItem(), Blocks.DIORITE.asItem(), - Blocks.GRANITE.asItem(), Blocks.CALCITE.asItem())); - tags.put(tagKey("mineralogy:stone_tool_materials"), holders(Blocks.COBBLESTONE.asItem(), - Blocks.BLACKSTONE.asItem(), Blocks.COBBLED_DEEPSLATE.asItem(), - Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem(), Blocks.BASALT.asItem(), - Blocks.TUFF.asItem(), Blocks.ANDESITE.asItem(), Blocks.DIORITE.asItem(), - Blocks.GRANITE.asItem(), Blocks.CALCITE.asItem())); - BuiltInRegistries.ITEM.bindTags(tags); - } - - private static Map, List>> snapshotItemTags() { - Map, List>> result = new IdentityHashMap<>(); - BuiltInRegistries.ITEM.getTags().forEach(pair -> { - List> holders = new ArrayList<>(); - pair.getSecond().forEach(holders::add); - result.put(pair.getFirst(), holders); - }); - return result; + JsonObject recipe = json(new File(MINERALOGY_RECIPE_ROOT, name + ".json")); + assertEquals(name, "minecraft:crafting_shapeless", recipe.get("type").getAsString()); + assertEquals(name, 1, recipe.getAsJsonArray("ingredients").size()); + assertEquals(name, source, recipe.getAsJsonArray("ingredients").get(0) + .getAsJsonObject().get("item").getAsString()); + assertEquals(name, result, recipe.getAsJsonObject("result").get("id").getAsString()); + assertEquals(name, 1, resultCount(recipe)); + JsonObject condition = recipe.getAsJsonObject("forge:condition"); + assertEquals(name, "forge:and", condition.get("type").getAsString()); + assertEquals(name, 2, condition.getAsJsonArray("values").size()); + } + + private static JsonObject selectedRecipe(JsonObject wrapper, boolean enabled) { + for (JsonElement element : wrapper.getAsJsonArray("recipes")) { + JsonObject branch = element.getAsJsonObject(); + if (conditionMatches(branch.getAsJsonObject("forge:condition"), enabled)) { + return branch.getAsJsonObject("recipe"); + } + } + return null; } - private static List> holders(Item... items) { - List> result = new ArrayList<>(); - for (Item item : items) { - ResourceKey key = BuiltInRegistries.ITEM.getResourceKey(item).get(); - result.add(BuiltInRegistries.ITEM.getHolderOrThrow(key)); + private static boolean conditionMatches(JsonObject condition, boolean enabled) { + String type = condition.get("type").getAsString(); + if ("mineralogy:config".equals(type)) { + assertEquals("COBBLESTONE_EQUIVILENT", condition.get("flag").getAsString()); + return enabled; } - return result; + if ("forge:not".equals(type)) { + return !conditionMatches(condition.getAsJsonObject("value"), enabled); + } + throw new AssertionError("Unexpected recipe condition " + type); } - private static TagKey tagKey(String value) { - return TagKey.create(Registries.ITEM, new ResourceLocation(value)); + private static String enabledMaterial(String name) { + if ("furnace".equals(name) || "brewing_stand".equals(name)) { + return "#mineralogy:stone_crafting_materials"; + } + if (name.startsWith("stone_") || "stone_sword".equals(name)) { + return "#mineralogy:stone_tool_materials"; + } + return "#mineralogy:cobblestone_equivalents"; } - private static void loadConfig(boolean enabled) throws Exception { - Path directory = Files.createTempDirectory("mineralogy-recipe-condition"); - Files.write(directory.resolve(MineralogyConfig.FILE_NAME), - ("[options]\nCOBBLESTONE_EQUIVILENT = " + enabled + "\n") - .getBytes(StandardCharsets.UTF_8)); - MineralogyConfig.load(directory); + private static String disabledMaterial(String name) { + if ("furnace".equals(name) || "brewing_stand".equals(name)) { + return "#minecraft:stone_crafting_materials"; + } + if (name.startsWith("stone_") || "stone_sword".equals(name)) { + return "#minecraft:stone_tool_materials"; + } + if (isTrimTemplateRecipe(name)) return "minecraft:cobblestone"; + return "#forge:cobblestone"; } - private static CraftingRecipe recipe(String name) throws Exception { - JsonObject wrapper = json(new File(RECIPE_ROOT, name + ".json")); - JsonObject selected = null; - for (JsonElement element : wrapper.getAsJsonArray("recipes")) { - JsonObject candidate = element.getAsJsonObject(); - if (CraftingHelper.processConditions(candidate.getAsJsonArray("conditions"), - ICondition.IContext.EMPTY)) { - selected = candidate.getAsJsonObject("recipe"); - break; + private static boolean containsIngredient(JsonElement element, String wanted) { + if (element == null || element.isJsonNull()) return false; + if (element.isJsonArray()) { + for (JsonElement child : element.getAsJsonArray()) { + if (containsIngredient(child, wanted)) return true; } + return false; + } + if (!element.isJsonObject()) return false; + JsonObject object = element.getAsJsonObject(); + if (wanted.startsWith("#") && object.has("tag") + && wanted.substring(1).equals(object.get("tag").getAsString())) return true; + if (!wanted.startsWith("#") && object.has("item") + && wanted.equals(object.get("item").getAsString())) return true; + for (java.util.Map.Entry child : object.entrySet()) { + if (containsIngredient(child.getValue(), wanted)) return true; } - assertTrue(name + " has no selected conditional branch", selected != null); - Recipe deserialized = RecipeManager.fromJson(new ResourceLocation("minecraft", name), selected); - assertTrue(name, deserialized instanceof CraftingRecipe); - return (CraftingRecipe) deserialized; + return false; } - private static CraftingRecipe mineralogyRecipe(String name, Item mineralogyStandIn) - throws Exception { - JsonObject data = json(new File(MINERALOGY_RECIPE_ROOT, name + ".json")); - String standInId = BuiltInRegistries.ITEM.getKey(mineralogyStandIn).toString(); - JsonObject ingredient = data.getAsJsonArray("ingredients").get(0).getAsJsonObject(); - if (ingredient.get("item").getAsString().startsWith("mineralogy:")) { - ingredient.addProperty("item", standInId); - } - JsonObject result = data.getAsJsonObject("result"); - if (result.get("item").getAsString().startsWith("mineralogy:")) { - result.addProperty("item", standInId); - } - Recipe deserialized = RecipeManager.fromJson( - new ResourceLocation("mineralogy", name), data); - assertTrue(name, deserialized instanceof CraftingRecipe); - return (CraftingRecipe) deserialized; + private static int resultCount(JsonObject recipe) { + JsonObject result = recipe.getAsJsonObject("result"); + return result.has("count") ? result.get("count").getAsInt() : 1; } - private static CraftingContainer inventory(String name, Item rock) { - if ("mossy_cobblestone_from_vine".equals(name)) { - return shapeless(new ItemStack(rock), new ItemStack(Blocks.VINE)); - } - if ("mossy_cobblestone_from_moss_block".equals(name)) { - return shapeless(new ItemStack(rock), new ItemStack(Blocks.MOSS_BLOCK)); - } - if ("andesite".equals(name)) { - return shapeless(new ItemStack(Blocks.DIORITE), new ItemStack(rock)); - } + private static int expectedCount(String name) { + if ("andesite".equals(name) || "diorite".equals(name)) return 2; + return 1; + } - if (isTrimTemplateRecipe(name)) { - Item template; - if ("coast_armor_trim_smithing_template".equals(name)) { - template = Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE; - } else if ("sentry_armor_trim_smithing_template".equals(name)) { - template = Items.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE; - } else { - template = Items.VEX_ARMOR_TRIM_SMITHING_TEMPLATE; - } - Map ingredients = new LinkedHashMap(); - ingredients.put('#', Items.DIAMOND); - ingredients.put('C', rock); - ingredients.put('S', template); - return shaped(new String[] { "#S#", "#C#", "###" }, ingredients); - } + private static String expectedOutput(String name) { + return name.startsWith("mossy_cobblestone_from_") + ? "minecraft:mossy_cobblestone" : "minecraft:" + name; + } - String[] pattern; - Map ingredients = new LinkedHashMap(); - ingredients.put('#', rock); - switch (name) { - case "furnace": pattern = new String[] { "###", "# #", "###" }; break; - case "brewing_stand": - pattern = new String[] { " B ", "###" }; - ingredients.put('B', Items.BLAZE_ROD); - break; - case "lever": - pattern = new String[] { "X", "#" }; - ingredients.put('X', Items.STICK); - break; - case "piston": - pattern = new String[] { "TTT", "#X#", "#R#" }; - ingredients.put('T', Blocks.OAK_PLANKS.asItem()); - ingredients.put('X', Items.IRON_INGOT); - ingredients.put('R', Items.REDSTONE); - break; - case "dispenser": - pattern = new String[] { "###", "#X#", "#R#" }; - ingredients.put('X', Items.BOW); - ingredients.put('R', Items.REDSTONE); - break; - case "dropper": - pattern = new String[] { "###", "# #", "#R#" }; - ingredients.put('R', Items.REDSTONE); - break; - case "observer": - pattern = new String[] { "###", "RRQ", "###" }; - ingredients.put('R', Items.REDSTONE); - ingredients.put('Q', Items.QUARTZ); - break; - case "diorite": - pattern = new String[] { "CQ", "QC" }; - ingredients.put('C', rock); - ingredients.put('Q', Items.QUARTZ); - break; - case "stone_axe": pattern = new String[] { "XX", "X#", " #" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; - case "stone_hoe": pattern = new String[] { "XX", " #", " #" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; - case "stone_pickaxe": pattern = new String[] { "XXX", " # ", " # " }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; - case "stone_shovel": pattern = new String[] { "X", "#", "#" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; - case "stone_sword": pattern = new String[] { "X", "X", "#" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; - default: throw new IllegalArgumentException(name); - } - return shaped(pattern, ingredients); + private static void assertCompositeTag(String name, String base) throws Exception { + JsonArray values = json(new File("src/main/resources/data/mineralogy/tags/items/" + + name + ".json")).getAsJsonArray("values"); + assertEquals(name, 28, values.size()); + assertEquals(name, base, values.get(0).getAsString()); + assertEquals(name, new LinkedHashSet(rockFamilies()), familyReferences(values)); } - private static CraftingContainer shaped(String[] pattern, Map ingredients) { - CraftingContainer inventory = new TransientCraftingContainer(dummyContainer(), 3, 3); - for (int row = 0; row < pattern.length; row++) { - for (int column = 0; column < pattern[row].length(); column++) { - Item item = ingredients.get(pattern[row].charAt(column)); - if (item != null) inventory.setItem(row * 3 + column, new ItemStack(item)); - } + private static Set familyReferences(JsonArray values) { + Set result = new LinkedHashSet(); + for (int index = 1; index < values.size(); index++) { + result.add(values.get(index).getAsString().replace("#mineralogy:stones/", "")); } - return inventory; + return result; } - private static CraftingContainer shapeless(ItemStack... stacks) { - CraftingContainer inventory = new TransientCraftingContainer(dummyContainer(), 3, 3); - for (int index = 0; index < stacks.length; index++) inventory.setItem(index, stacks[index]); - return inventory; + private static void assertTagContains(String relative, String... entries) throws Exception { + JsonArray values = json(new File("src/main/resources", relative)).getAsJsonArray("values"); + for (String entry : entries) assertTrue(relative + " " + entry, values.toString().contains(entry)); } - private static AbstractContainerMenu dummyContainer() { - return new AbstractContainerMenu(null, -1) { - @Override - public ItemStack quickMoveStack(Player player, int index) { - return ItemStack.EMPTY; - } - - @Override - public boolean stillValid(Player playerIn) { - return false; - } - }; + private static java.util.List rockFamilies() { + return Arrays.asList("andesite", "basalt", "diorite", "granite", "rhyolite", + "pegmatite", "diabase", "gabbro", "peridotite", "basaltic_glass", + "scoria", "tuff", "shale", "conglomerate", "dolomite", "limestone", + "siltstone", "marble", "slate", "schist", "gneiss", "phyllite", + "amphibolite", "hornfels", "quartzite", "novaculite", "rock_salt"); } private static String[] recipeNames() { @@ -396,15 +213,9 @@ private static boolean isTrimTemplateRecipe(String name) { return name.endsWith("_armor_trim_smithing_template"); } - private static Item[] ordinaryRockInputs() { - return new Item[] { Blocks.BASALT.asItem(), Blocks.TUFF.asItem(), - Blocks.ANDESITE.asItem(), Blocks.DIORITE.asItem(), Blocks.GRANITE.asItem(), - Blocks.CALCITE.asItem() }; - } - private static JsonObject json(File file) throws Exception { try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { - return new JsonParser().parse(reader).getAsJsonObject(); + return JsonParser.parseReader(reader).getAsJsonObject(); } } } diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index 440fe39b9..eb21f1b97 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -71,6 +71,15 @@ public void providerUsesOreSpawnFourAndOwnsNoVanillaGeneration() throws Exceptio stringSet(oil.getAsJsonArray("biome_dictionary"))); } + @Test + public void customAdvancementUsesTheDataComponentItemStackShape() throws Exception { + JsonObject advancement = json(new File(ROOT, + "data/mineralogy/advancements/mineralogy/all_the_rocks.json")); + JsonObject icon = advancement.getAsJsonObject("display").getAsJsonObject("icon"); + assertEquals("mineralogy:basalt", icon.get("id").getAsString()); + assertFalse(icon.has("item")); + } + @Test public void everyRecipeHasAProgressiveAdvancement() throws Exception { File recipeDir = new File(ROOT, "data/mineralogy/recipes"); @@ -94,12 +103,13 @@ public void everyRecipeHasAProgressiveAdvancement() throws Exception { advancement.getAsJsonObject("rewards").getAsJsonArray("recipes").get(0).getAsString()); assertTrue(advancement.getAsJsonObject("criteria").has("has_the_recipe")); assertTrue(advancement.getAsJsonObject("criteria").has("has_rock")); - if (recipe.has("conditions")) { - assertTrue(recipeFile.getName(), recipe.get("conditions").isJsonArray()); - assertTrue(recipeFile.getName(), advancement.has("conditions")); - assertEquals(recipeFile.getName(), recipe.get("conditions"), advancement.get("conditions")); + if (recipe.has("forge:condition")) { + assertTrue(recipeFile.getName(), recipe.get("forge:condition").isJsonObject()); + assertTrue(recipeFile.getName(), advancement.has("forge:condition")); + assertEquals(recipeFile.getName(), recipe.get("forge:condition"), + advancement.get("forge:condition")); } else { - assertFalse(recipeFile.getName(), advancement.has("conditions")); + assertFalse(recipeFile.getName(), advancement.has("forge:condition")); } } @@ -117,7 +127,7 @@ public void everyRecipeHasAProgressiveAdvancement() throws Exception { } @Test - public void advancementsUseMinecraft119ItemPredicateSchema() throws Exception { + public void advancementsUseMinecraft1206HolderSetPredicateSchema() throws Exception { File mineralogy = new File(ROOT, "data/mineralogy/advancements"); for (File file : jsonFiles(mineralogy)) { JsonObject advancement = json(file); @@ -131,8 +141,7 @@ public void advancementsUseMinecraft119ItemPredicateSchema() throws Exception { JsonObject wrapper = json(file); if (wrapper.has("advancements")) { for (JsonElement branch : wrapper.getAsJsonArray("advancements")) { - assertInventoryPredicates(file.getPath(), branch.getAsJsonObject() - .getAsJsonObject("advancement")); + assertInventoryPredicates(file.getPath(), branch.getAsJsonObject()); } } else { assertInventoryPredicates(file.getPath(), wrapper); @@ -141,7 +150,7 @@ public void advancementsUseMinecraft119ItemPredicateSchema() throws Exception { } @Test - public void minecraftOverridesUseForge47WrappersAndRecipeBookFields() throws Exception { + public void minecraftOverridesUseForge50WrappersAndRecipeBookFields() throws Exception { File recipeDirectory = new File(ROOT, "data/minecraft/recipes"); File[] recipes = recipeDirectory.listFiles((directory, name) -> name.endsWith(".json")); assertNotNull(recipes); @@ -152,7 +161,7 @@ public void minecraftOverridesUseForge47WrappersAndRecipeBookFields() throws Exc assertEquals(file.getName(), 2, outer.getAsJsonArray("recipes").size()); for (JsonElement element : outer.getAsJsonArray("recipes")) { JsonObject branch = element.getAsJsonObject(); - assertTrue(file.getName(), branch.get("conditions").isJsonArray()); + assertTrue(file.getName(), branch.get("forge:condition").isJsonObject()); assertRecipeBookFields(file.getName(), branch.getAsJsonObject("recipe")); } } else { @@ -252,7 +261,7 @@ public void nativeRockAliasesDriveRecipesAndAdvancementsWithoutStealingVanillaFo assertEquals("minecraft:sand", vanillaPolished.getAsJsonArray("ingredients") .get(1).getAsJsonObject().get("item").getAsString()); assertEquals("minecraft:polished_" + family, vanillaPolished - .getAsJsonObject("result").get("item").getAsString()); + .getAsJsonObject("result").get("id").getAsString()); assertEquals(1, vanillaPolished.getAsJsonObject("result").get("count").getAsInt()); JsonObject nativeAdvancement = json(new File(ROOT, @@ -261,11 +270,11 @@ public void nativeRockAliasesDriveRecipesAndAdvancementsWithoutStealingVanillaFo assertEquals("minecraft:" + family, nativeAdvancement.getAsJsonObject("criteria") .getAsJsonObject("has_rock").getAsJsonObject("conditions") .getAsJsonArray("items").get(0).getAsJsonObject() - .getAsJsonArray("items").get(0).getAsString()); + .get("items").getAsString()); assertEquals("minecraft:sand", nativeAdvancement.getAsJsonObject("criteria") .getAsJsonObject("has_sand").getAsJsonObject("conditions") .getAsJsonArray("items").get(0).getAsJsonObject() - .getAsJsonArray("items").get(0).getAsString()); + .get("items").getAsString()); assertEquals(2, nativeAdvancement.getAsJsonArray("requirements").size()); } @@ -297,7 +306,7 @@ public void acceptedRecipeDetailsArePresent() throws Exception { assertEquals("mineralogy:stones/basalt", json(new File(recipes, "basalt_slab.json")) .getAsJsonObject("key").getAsJsonObject("x").get("tag").getAsString()); assertEquals("mineralogy:basalt", json(new File(recipes, "basalt_raw_slab_recombination.json")) - .getAsJsonObject("result").get("item").getAsString()); + .getAsJsonObject("result").get("id").getAsString()); assertEquals("forge:sand", json(new File(recipes, "basalt_brick_block_polishing.json")) .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("tag").getAsString()); JsonObject furnace = json(new File(recipes, "basalt_furnace.json")); @@ -313,7 +322,7 @@ public void acceptedRecipeDetailsArePresent() throws Exception { assertEquals("minecraft:stone_crafting_materials", conditionalRecipe(furnaceOverride, 1) .getAsJsonObject("key").getAsJsonObject("#").get("tag").getAsString()); assertEquals("COBBLESTONE_EQUIVILENT", furnaceOverride.getAsJsonArray("recipes").get(0) - .getAsJsonObject().getAsJsonArray("conditions").get(0).getAsJsonObject() + .getAsJsonObject().getAsJsonObject("forge:condition") .get("flag").getAsString()); assertTrue(new File(ROOT, "data/minecraft/recipes/stone_pickaxe.json").isFile()); assertEquals("#forge:cobblestone", json(new File(ROOT, @@ -379,13 +388,11 @@ public void allSeventeenLocalesHaveOrdered938KeyParity() throws Exception { } @Test - public void forge47ResourcesRetainNativeWallsTagsAndPackFormats() throws Exception { + public void forge50ResourcesRetainNativeWallsTagsAndPackFormats() throws Exception { JsonObject pack = json(new File(ROOT, "pack.mcmeta")); - assertEquals(15, pack.getAsJsonObject("pack").get("pack_format").getAsInt()); - assertEquals(15, pack.getAsJsonObject("pack") - .get("forge:resource_pack_format").getAsInt()); - assertEquals(15, pack.getAsJsonObject("pack") - .get("forge:data_pack_format").getAsInt()); + assertEquals(32, pack.getAsJsonObject("pack").get("pack_format").getAsInt()); + assertFalse(pack.getAsJsonObject("pack").has("forge:resource_pack_format")); + assertFalse(pack.getAsJsonObject("pack").has("forge:data_pack_format")); File blockstates = new File(ROOT, "assets/mineralogy/blockstates"); File[] wallStates = blockstates.listFiles((dir, name) -> name.endsWith("_wall.json")); @@ -448,7 +455,7 @@ public void forge47ResourcesRetainNativeWallsTagsAndPackFormats() throws Excepti assertEquals(id, "minecraft:diamond", branch.getAsJsonObject("key").getAsJsonObject("#").get("item").getAsString()); assertEquals(id, "minecraft:" + id, - branch.getAsJsonObject("result").get("item").getAsString()); + branch.getAsJsonObject("result").get("id").getAsString()); assertEquals(id, 2, branch.getAsJsonObject("result").get("count").getAsInt()); } } @@ -476,7 +483,7 @@ public void generatedRecipeAdvancementsDisableTelemetry() throws Exception { JsonObject wrapper = json(file); if (wrapper.has("advancements")) { for (JsonElement branch : wrapper.getAsJsonArray("advancements")) { - JsonObject advancement = branch.getAsJsonObject().getAsJsonObject("advancement"); + JsonObject advancement = branch.getAsJsonObject(); assertTrue(file.getPath(), advancement.has("sends_telemetry_event")); assertFalse(file.getPath(), advancement.get("sends_telemetry_event").getAsBoolean()); } @@ -533,14 +540,14 @@ public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws File advancementRoot = new File(ROOT, "data/minecraft/advancements/recipes"); assertEquals(20, countJsonFiles(advancementRoot)); JsonObject furnace = json(new File(advancementRoot, "decorations/furnace.json")); - assertEquals("mineralogy:stone_crafting_materials", conditionalAdvancement(furnace, 0) + assertEquals("#mineralogy:stone_crafting_materials", conditionalAdvancement(furnace, 0) .getAsJsonObject("criteria").getAsJsonObject("has_cobblestone") .getAsJsonObject("conditions").getAsJsonArray("items").get(0) - .getAsJsonObject().get("tag").getAsString()); - assertEquals("minecraft:stone_crafting_materials", conditionalAdvancement(furnace, 1) + .getAsJsonObject().get("items").getAsString()); + assertEquals("#minecraft:stone_crafting_materials", conditionalAdvancement(furnace, 1) .getAsJsonObject("criteria").getAsJsonObject("has_cobblestone") .getAsJsonObject("conditions").getAsJsonArray("items").get(0) - .getAsJsonObject().get("tag").getAsString()); + .getAsJsonObject().get("items").getAsString()); Object[][] advancementContracts = { { "decorations/furnace", "has_cobblestone", "tag", @@ -573,14 +580,14 @@ public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws @Test public void oilAndBuildMetadataUseStableTargetIdentities() throws Exception { String properties = new String(Files.readAllBytes(new File("gradle.properties").toPath()), StandardCharsets.UTF_8); - assertTrue(properties.contains("mod_version=6.1.1.120011")); - assertTrue(properties.contains("orespawn_curse_file_id=8784008")); + assertTrue(properties.contains("mod_version=6.1.1.120061")); + assertTrue(properties.contains("orespawn_curse_file_id=8786031")); String build = new String(Files.readAllBytes(new File("build.gradle").toPath()), StandardCharsets.UTF_8); - assertTrue(build.contains("runtimeOnly renamer.dependency(\"curse.maven:mmd-orespawn-")); + assertTrue(build.contains("runtimeOnly \"curse.maven:mmd-orespawn-")); assertTrue(build.contains("orespawnRelease")); String metadata = new String(Files.readAllBytes(new File(ROOT, "META-INF/mods.toml").toPath()), StandardCharsets.UTF_8); - assertTrue(metadata.contains("loaderVersion=\"[47,)\"")); - assertTrue(metadata.contains("versionRange=\"[47.4.10,48)\"")); + assertTrue(metadata.contains("loaderVersion=\"[50,)\"")); + assertTrue(metadata.contains("versionRange=\"[50.2.0,51)\"")); assertTrue(metadata.contains("versionRange=\"[4.0.6,5.0.0)\"")); assertTrue(metadata.contains("ordering=\"AFTER\"")); assertTrue(new File(ROOT, "assets/mineralogy/textures/items/crude_oil_bucket.png").isFile()); @@ -623,7 +630,7 @@ public void internalWorldgenAndRetiredPackagesAreAbsent() throws Exception { private static String criterionItem(JsonObject advancement, String criterion) { return advancement.getAsJsonObject("criteria").getAsJsonObject(criterion) .getAsJsonObject("conditions").getAsJsonArray("items").get(0) - .getAsJsonObject().getAsJsonArray("items").get(0).getAsString(); + .getAsJsonObject().get("items").getAsString(); } private static void assertInventoryPredicates(String source, JsonObject advancement) { @@ -636,10 +643,21 @@ private static void assertInventoryPredicates(String source, JsonObject advancem assertNotNull(source + " " + entry.getKey(), predicates); for (JsonElement element : predicates) { JsonObject predicate = element.getAsJsonObject(); - assertFalse(source + " " + entry.getKey() + " uses the pre-1.17 singular item key", + assertFalse(source + " " + entry.getKey() + " uses the obsolete singular item key", predicate.has("item")); - assertTrue(source + " " + entry.getKey(), predicate.has("tag") - || (predicate.has("items") && predicate.getAsJsonArray("items").size() > 0)); + assertEquals(source + " " + entry.getKey(), 1, predicate.size()); + assertTrue(source + " " + entry.getKey(), predicate.has("items")); + JsonElement holderSet = predicate.get("items"); + if (holderSet.isJsonArray()) { + assertTrue(source + " " + entry.getKey(), holderSet.getAsJsonArray().size() > 0); + for (JsonElement holder : holderSet.getAsJsonArray()) { + assertTrue(source + " " + entry.getKey(), holder.isJsonPrimitive() + && !holder.getAsString().isEmpty()); + } + } else { + assertTrue(source + " " + entry.getKey(), holderSet.isJsonPrimitive() + && !holderSet.getAsString().isEmpty()); + } } } } @@ -682,11 +700,8 @@ private static void assertAdvancementIngredient(String recipeName, String key, S JsonObject ingredient = advancement.getAsJsonObject("criteria") .getAsJsonObject("has_rock").getAsJsonObject("conditions") .getAsJsonArray("items").get(0).getAsJsonObject(); - if ("item".equals(key)) { - assertEquals(recipeName, value, ingredient.getAsJsonArray("items").get(0).getAsString()); - } else { - assertEquals(recipeName, value, ingredient.get(key).getAsString()); - } + String expected = "tag".equals(key) ? "#" + value : value; + assertEquals(recipeName, expected, ingredient.get("items").getAsString()); assertEquals(recipeName, 1, ingredient.size()); } @@ -699,9 +714,9 @@ private static void assertNativeSlabOverride(String recipeName, String source, assertEquals(recipeName, source, enabled.getAsJsonObject("key") .getAsJsonObject("#").get("item").getAsString()); assertEquals(recipeName, mineralogyResult, - enabled.getAsJsonObject("result").get("item").getAsString()); + enabled.getAsJsonObject("result").get("id").getAsString()); assertEquals(recipeName, vanillaResult, - fallback.getAsJsonObject("result").get("item").getAsString()); + fallback.getAsJsonObject("result").get("id").getAsString()); assertEquals(recipeName, count, enabled.getAsJsonObject("result").get("count").getAsInt()); } @@ -714,9 +729,13 @@ private static void assertNativeStonecuttingOverride(String recipeName, String s assertEquals(recipeName, "minecraft:stonecutting", enabled.get("type").getAsString()); assertEquals(recipeName, source, enabled.getAsJsonObject("ingredient").get("item").getAsString()); - assertEquals(recipeName, mineralogyResult, enabled.get("result").getAsString()); - assertEquals(recipeName, vanillaResult, fallback.get("result").getAsString()); - assertEquals(recipeName, 2, enabled.get("count").getAsInt()); + assertEquals(recipeName, mineralogyResult, + enabled.getAsJsonObject("result").get("id").getAsString()); + assertEquals(recipeName, vanillaResult, + fallback.getAsJsonObject("result").get("id").getAsString()); + assertEquals(recipeName, 2, + enabled.getAsJsonObject("result").get("count").getAsInt()); + assertFalse(recipeName, enabled.has("count")); } private static void assertNativeSlabConversion(String recipeName, String source, @@ -727,13 +746,16 @@ private static void assertNativeSlabConversion(String recipeName, String source, assertEquals(recipeName, 1, recipe.getAsJsonArray("ingredients").size()); assertEquals(recipeName, source, recipe.getAsJsonArray("ingredients").get(0) .getAsJsonObject().get("item").getAsString()); - assertEquals(recipeName, result, recipe.getAsJsonObject("result").get("item").getAsString()); + assertEquals(recipeName, result, recipe.getAsJsonObject("result").get("id").getAsString()); assertEquals(recipeName, 1, recipe.getAsJsonObject("result").get("count").getAsInt()); - assertEquals(recipeName, 2, recipe.getAsJsonArray("conditions").size()); + assertEquals(recipeName, "forge:and", + recipe.getAsJsonObject("forge:condition").get("type").getAsString()); + assertEquals(recipeName, 2, recipe.getAsJsonObject("forge:condition") + .getAsJsonArray("values").size()); JsonObject advancement = json(new File(ROOT, "data/mineralogy/advancements/recipes/" + recipeName + ".json")); - assertEquals(recipeName, recipe.get("conditions"), advancement.get("conditions")); + assertEquals(recipeName, recipe.get("forge:condition"), advancement.get("forge:condition")); assertEquals(recipeName, source, criterionItem(advancement, "has_rock")); assertEquals(recipeName, "mineralogy:" + recipeName, advancement.getAsJsonObject("rewards").getAsJsonArray("recipes") @@ -785,8 +807,7 @@ private static void assertRecipeBookFields(String name, JsonObject recipe) { } private static JsonObject conditionalAdvancement(JsonObject wrapper, int index) { - return wrapper.getAsJsonArray("advancements").get(index).getAsJsonObject() - .getAsJsonObject("advancement"); + return wrapper.getAsJsonArray("advancements").get(index).getAsJsonObject(); } private static void assertConditionalAdvancement(File file, String criterion, String key, @@ -794,20 +815,19 @@ private static void assertConditionalAdvancement(File file, String criterion, St JsonObject wrapper = json(file); assertEquals(file.getPath(), 2, wrapper.getAsJsonArray("advancements").size()); assertEquals(file.getPath(), "mineralogy:config", wrapper.getAsJsonArray("advancements") - .get(0).getAsJsonObject().getAsJsonArray("conditions").get(0) - .getAsJsonObject().get("type").getAsString()); + .get(0).getAsJsonObject().getAsJsonObject("forge:condition") + .get("type").getAsString()); assertEquals(file.getPath(), "forge:not", wrapper.getAsJsonArray("advancements") - .get(1).getAsJsonObject().getAsJsonArray("conditions").get(0) - .getAsJsonObject().get("type").getAsString()); + .get(1).getAsJsonObject().getAsJsonObject("forge:condition") + .get("type").getAsString()); for (int branch = 0; branch < 2; branch++) { JsonObject advancement = conditionalAdvancement(wrapper, branch); JsonObject ingredient = advancement.getAsJsonObject("criteria") .getAsJsonObject(criterion).getAsJsonObject("conditions") .getAsJsonArray("items").get(0).getAsJsonObject(); - String actual = "item".equals(key) - ? ingredient.getAsJsonArray("items").get(0).getAsString() - : ingredient.get(key).getAsString(); - assertEquals(file.getPath(), branch == 0 ? enabledValue : fallbackValue, actual); + String actual = ingredient.get("items").getAsString(); + String expected = branch == 0 ? enabledValue : fallbackValue; + assertEquals(file.getPath(), "tag".equals(key) ? "#" + expected : expected, actual); JsonArray requirements = advancement.getAsJsonArray("requirements"); assertEquals(file.getPath(), 1, requirements.size()); assertTrue(file.getPath(), requirements.get(0).isJsonArray()); @@ -839,30 +859,34 @@ private static List jsonFiles(File directory) { private static JsonObject json(File file) throws Exception { try (java.io.Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { - return new JsonParser().parse(reader).getAsJsonObject(); + return JsonParser.parseReader(reader).getAsJsonObject(); } } private static void assertGunpowderRecipe(File recipes, String name, String requiredTag) throws Exception { JsonObject recipe = json(new File(recipes, name + ".json")); assertEquals(name, 3, recipe.getAsJsonArray("ingredients").size()); - assertGunpowderConditions(name, requiredTag, recipe.getAsJsonArray("conditions")); + assertGunpowderConditions(name, requiredTag, recipe.getAsJsonObject("forge:condition")); JsonObject advancement = json(new File(ROOT, "data/mineralogy/advancements/recipes/" + name + ".json")); assertGunpowderConditions(name + " advancement", requiredTag, - advancement.getAsJsonArray("conditions")); + advancement.getAsJsonObject("forge:condition")); } - private static void assertGunpowderConditions(String name, String requiredTag, JsonArray conditions) { - assertEquals(name, requiredTag == null ? 1 : 2, conditions.size()); - assertEquals(name, "mineralogy:config", - conditions.get(0).getAsJsonObject().get("type").getAsString()); + private static void assertGunpowderConditions(String name, String requiredTag, JsonObject condition) { if (requiredTag != null) { + assertEquals(name, "forge:and", condition.get("type").getAsString()); + JsonArray conditions = condition.getAsJsonArray("values"); + assertEquals(name, 2, conditions.size()); + assertEquals(name, "mineralogy:config", + conditions.get(0).getAsJsonObject().get("type").getAsString()); JsonObject tagCondition = conditions.get(1).getAsJsonObject(); assertEquals(name, "forge:not", tagCondition.get("type").getAsString()); JsonObject value = tagCondition.getAsJsonObject("value"); assertEquals(name, "forge:tag_empty", value.get("type").getAsString()); assertEquals(name, requiredTag, value.get("tag").getAsString()); + } else { + assertEquals(name, "mineralogy:config", condition.get("type").getAsString()); } } diff --git a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java index 53dc2f90e..be87b3a97 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java @@ -19,19 +19,19 @@ public void releaseMetadataIdentifiesTheGenericForgeTarget() throws Exception { try (FileInputStream input = new FileInputStream("gradle.properties")) { properties.load(input); } - assertEquals("6.1.1.120011", properties.getProperty("mod_version")); - assertEquals("1.20.1", properties.getProperty("minecraft_version")); + assertEquals("6.1.1.120061", properties.getProperty("mod_version")); + assertEquals("1.20.6", properties.getProperty("minecraft_version")); assertEquals(properties.getProperty("mc_version"), properties.getProperty("minecraft_version")); assertEquals("forge", properties.getProperty("loader_name")); assertEquals("1", properties.getProperty("loader_code")); - assertEquals("17", properties.getProperty("java_version")); - assertEquals("17.0.1+12", properties.getProperty("java_toolchain_version")); - assertEquals("17", properties.getProperty("gradle_java_version")); + assertEquals("21", properties.getProperty("java_version")); + assertEquals("21.0.7+6", properties.getProperty("java_toolchain_version")); + assertEquals("21", properties.getProperty("gradle_java_version")); assertEquals("240974", properties.getProperty("curseforge_project_id")); assertEquals("zone.moddev.mc.mineralogy", properties.getProperty("mod_group")); - assertEquals("4.0.16.120011", properties.getProperty("orespawn_version")); - assertEquals("8784008", properties.getProperty("orespawn_curse_file_id")); - assertEquals("EE0CE2A00CD883CA270FFE900016D42633B03D50E9AC65FD95797822D95C3A22", + assertEquals("4.0.16.120061", properties.getProperty("orespawn_version")); + assertEquals("8786031", properties.getProperty("orespawn_curse_file_id")); + assertEquals("D86A14957B9996DDA0465C413C60811B7473EF327FC16E95266B522F06CBE806", properties.getProperty("orespawn_sha256")); } @@ -42,11 +42,12 @@ public void ciAndSecurityChecksUsePinnedTargetNativeBuilds() throws Exception { String wrapper = text(".github/workflows/validate-gradle-build.yml"); String staging = text("gradle/stage-orespawn-release.sh"); assertTrue(ci.contains("name: Build, test, and audit")); - assertTrue(ci.contains("master-1.20.1")); + assertTrue(ci.contains("master-1.20.6")); assertTrue(ci.contains("Install pinned Java 8 launcher toolchain")); assertTrue(ci.contains("java-version: '8.0.502+7'")); - assertTrue(ci.contains("java-version: '17.0.1+12'")); - assertTrue(ci.contains("Install pinned Java 17 runtime and toolchain")); + assertTrue(ci.contains("java-version: '21.0.7+6.0.LTS'")); + assertTrue(ci.contains("Install pinned Java 21 runtime and toolchain")); + assertTrue(ci.contains("applied 0 rule(s) for net.minecraftforge:forge:1.20.6-50.2.0 (explicit no-op)")); assertTrue(ci.contains("$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64")); assertTrue(ci.contains("verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums")); assertTrue(ci.contains("genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath")); @@ -79,8 +80,8 @@ public void tagValidatorIsGenericAndDoesNotDispatchPublication() throws Exceptio public void buildPublishesOnlyThePreparedRemoteBundle() throws Exception { String build = text("build.gradle"); assertTrue(build.contains("options.addBooleanOption('notimestamp', true)")); - assertTrue(build.contains("id 'net.minecraftforge.renamer' version '1.1.5'")); - assertTrue(build.contains("def releaseJar = renamer.classes")); + assertFalse(build.contains("net.minecraftforge.renamer")); + assertTrue(build.contains("def releaseJar = tasks.named('jar', Jar)")); assertTrue(build.contains("preserveFileTimestamps = false")); assertTrue(build.contains("reproducibleFileOrder = true")); assertTrue(build.contains("def preparedReleaseDir = project.findProperty('preparedReleaseDir')")); @@ -106,6 +107,18 @@ public void stagedOreSpawnDependencyCannotFallThroughToPublicRepositories() thro assertTrue(build.contains("'OreSpawnReleaseVerificationMirror'")); } + @Test + public void eclipseLaunchesQuoteCompleteSlimeLauncherPaths() throws Exception { + String build = text("build.gradle"); + assertTrue(build.contains("['cache', 'metadata', 'to-srg', 'to-obf'].each")); + assertTrue(build.contains(""${value}"")); + assertTrue(build.contains("Eclipse launch does not quote its --${flag} path")); + assertTrue(build.contains("if (launch.contains('-DlegacyClassPath.file=')")); + assertTrue(build.contains("entry.path == 'src/main/resources'")); + assertTrue(build.contains("'build/resources/main', 'bin/main'")); + assertTrue(build.contains("Eclipse must use processed production resources")); + } + private static String text(String path) throws Exception { return new String(Files.readAllBytes(new File(path).toPath()), StandardCharsets.UTF_8) .replace("\r\n", "\n").replace('\r', '\n'); diff --git a/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java b/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java index fc30d5eb4..956de411d 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java @@ -45,7 +45,7 @@ public void rebuiltTagPreservesVanillaAndAddsOrRemovesConfiguredElements() { Holder vanilla = holder(Blocks.COBBLESTONE.asItem()); Holder mineralogyStandIn = holder(Blocks.BASALT.asItem()); TagKey cobblestone = TagKey.create(Registries.ITEM, - new ResourceLocation("forge", "cobblestone")); + ResourceLocation.fromNamespaceAndPath("forge", "cobblestone")); Map, List>> tags = new IdentityHashMap<>(); tags.put(cobblestone, list(vanilla));