diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..e5ff6692c --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,82 @@ +name: Mineralogy 1.18.2 CI + +on: + push: + branches: + - master-1.18.2 + - 'feature/**' + pull_request: + branches: + - master-1.18.2 + +permissions: + contents: read + +concurrency: + group: mineralogy-1.18-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + name: Build, test, and audit + runs-on: ubuntu-latest + timeout-minutes: 60 + + steps: + - name: Check out source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + + - name: Install pinned Java 17 runtime and toolchain + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '17.0.1+12' + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + + - name: Stage exact OreSpawn release dependency + id: orespawn + run: | + mirror="$RUNNER_TEMP/orespawn-mirror" + bash gradle/stage-orespawn-release.sh "$mirror" + echo "repository=$mirror" >> "$GITHUB_OUTPUT" + + - name: Build, test, and audit release artifacts + run: | + chmod +x ./gradlew + ./gradlew clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums \ + -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ + --no-daemon --stacktrace + + - name: Generate and audit Eclipse production launches + run: >- + ./gradlew genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath + -PorespawnVerificationRepository=${{ steps.orespawn.outputs.repository }} + --no-daemon --stacktrace + + - name: Upload audited release candidate + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + with: + name: Mineralogy-1.18.2-${{ github.sha }} + if-no-files-found: error + retention-days: 30 + path: | + build/libs/Mineralogy-6.1.0.118021.jar + build/libs/Mineralogy-6.1.0.118021-sources.jar + build/libs/Mineralogy-6.1.0.118021-javadoc.jar + build/release/SHA256SUMS + CHANGELOG.txt + + - name: Upload diagnostics on failure + if: failure() + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + with: + name: Mineralogy-1.18.2-diagnostics-${{ github.sha }} + if-no-files-found: ignore + retention-days: 14 + path: | + build/test-results/** + build/reports/** + build/*-run/logs/** + build/problems/** diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 000000000..28a02717d --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,47 @@ +name: CodeQL + +on: + push: + branches: + - master-1.18.2 + - 'feature/**' + pull_request: + branches: + - master-1.18.2 + +permissions: + actions: read + contents: read + security-events: write + +jobs: + analyze: + name: Analyze Java + runs-on: ubuntu-latest + timeout-minutes: 45 + + steps: + - name: Check out source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + + - name: Install pinned Java 17 runtime and toolchain + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '17.0.1+12' + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + + - name: Initialize CodeQL + uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 + with: + languages: java-kotlin + + - name: Compile production code + run: | + chmod +x ./gradlew + ./gradlew clean classes --rerun-tasks --no-build-cache --no-daemon --stacktrace + + - name: Analyze + uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml new file mode 100644 index 000000000..78326a6c9 --- /dev/null +++ b/.github/workflows/release-on-tag.yml @@ -0,0 +1,92 @@ +name: Validate Mineralogy release tag + +on: + push: + tags: + - '*.*.*.*' + +permissions: + actions: read + contents: read + +concurrency: + group: mineralogy-release-tag-${{ github.ref_name }} + cancel-in-progress: false + +jobs: + validate-release-tag: + name: Validate tag for manual release confirmation + if: github.repository == 'MinecraftModDevelopmentMods/MinecraftMineralogy' + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Check out tagged source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + with: + fetch-depth: 0 + + - name: Validate release tag, target metadata, and prior CI + env: + GH_TOKEN: ${{ github.token }} + run: | + set -euo pipefail + + value() { sed -n "s/^$1=//p" gradle.properties; } + release_version="$(value mod_version)" + minecraft_version="$(value minecraft_version)" + loader_name="$(value loader_name)" + loader_code="$(value loader_code)" + + IFS=. read -r mc_major mc_minor mc_patch extra <<<"$minecraft_version" + if [[ -n "${extra:-}" || -z "${mc_major:-}" || -z "${mc_minor:-}" ]]; then + echo "Invalid minecraft_version=$minecraft_version" >&2 + exit 1 + fi + mc_patch="${mc_patch:-0}" + if [[ ! "$mc_major" =~ ^[0-9]+$ || ! "$mc_minor" =~ ^[0-9]+$ || ! "$mc_patch" =~ ^[0-9]+$ ]]; then + echo "Invalid minecraft_version=$minecraft_version" >&2 + exit 1 + fi + case "$loader_name:$loader_code" in + forge:1|neoforge:2) ;; + *) echo "Invalid loader metadata $loader_name/$loader_code" >&2; exit 1 ;; + esac + printf -v minor_padded '%02d' "$((10#$mc_minor))" + printf -v patch_padded '%02d' "$((10#$mc_patch))" + target_suffix="${mc_major}${minor_padded}${patch_padded}${loader_code}" + + if [[ ! "$release_version" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.${target_suffix}$ ]]; then + echo "mod_version $release_version does not match $minecraft_version $loader_name target $target_suffix" >&2 + exit 1 + fi + if [[ "$GITHUB_REF_NAME" != "$release_version" ]]; then + echo "Release tag must equal mod_version $release_version; found $GITHUB_REF_NAME" >&2 + exit 1 + fi + + successful_ci="$(gh api \ + "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA/check-runs?per_page=100" \ + --jq '[.check_runs[] | select(.name == "Build, test, and audit" and .conclusion == "success")] | length')" + if [[ "$successful_ci" -lt 1 ]]; then + echo "The tagged commit has no successful Build, test, and audit check" >&2 + exit 1 + fi + + - name: Record the manual publication interface + env: + RELEASE_WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/workflows/deploy-release.yml + run: | + { + echo "## Release tag validated" + echo + echo "Tag \`$GITHUB_REF_NAME\` matches the selected target and has a successful Build, test, and audit check." + echo + echo "If this tag was created outside the release workflow, nothing has been published." + echo + echo "To start or recover publication, open [Release Mineralogy]($RELEASE_WORKFLOW_URL), select **Run workflow**, and enter:" + echo + echo "- release version: \`$GITHUB_REF_NAME\`" + echo "- CurseForge release level: \`release\`, \`beta\`, or \`alpha\`" + echo "- confirm live publication: checked" + } >> "$GITHUB_STEP_SUMMARY" diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml new file mode 100644 index 000000000..afe21adc4 --- /dev/null +++ b/.github/workflows/validate-gradle-build.yml @@ -0,0 +1,23 @@ +name: Validate Gradle Wrapper + +on: + push: + branches: + - master-1.18.2 + - 'feature/**' + pull_request: + branches: + - master-1.18.2 + +permissions: + contents: read + +jobs: + validation: + name: Validation + runs-on: ubuntu-latest + steps: + - name: Check out source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + - name: Validate wrapper integrity + uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8067d0f67..2c034b46c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1 +1,96 @@ -Mineralogy 1.12.x +Mineralogy 6.1.0.118021 for Minecraft 1.18.2 + +- Delegated terrain, strata, ore, and covered fluid-deposit generation to the + released OreSpawn 4.0.10.118021 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.18.2'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. + Legacy state tables now support the complete 12-bit mod block-ID range in + both development and packaged runtimes, and each selected save reinstalls + its own numeric mapping after the client enumerates multiple old worlds. +- Added compatibility-safe controls for drywall, rock-salt lamps, mineral + dusts, and fertilizer, plus the stable five-way grouped creative tabs. + Disabled content remains registered and usable in established worlds. +- Preserved vertically mounted legacy rock-salt lamps on torch-supporting + blocks such as fences during pre-flattening world conversion. +- 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 40 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.18'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 + a terrain and ore host rather than becoming a construction family. +- Preserved rock-furnace save recovery and novaculite's 3/15/1 properties; + corrected replacement drop semantics and exact full-block Silk Touch results + for double slabs. +- Ported the accepted recipe contract as 1,427 native JSON recipes and matching + advancements: safe 4-to-1 mineral packing, charcoal and Base Metals dust + gunpowder routes, exact slabs, slab recombination, construction-form brick + conversions, progressive sand polishing, matching-slab rock furnaces, and + blank-to-marked relief progression. Each rock-furnace recipe is revealed as + soon as its matching slab is acquired, before a vanilla furnace is crafted. +- Reconciled Minecraft's native andesite, basalt, diorite, and granite with + their retained Mineralogy world-compatibility blocks. Native blocks now + unlock and feed every non-conflicting matching Mineralogy recipe. The four + vanilla 2x2 polished-block recipes are replaced by block-plus-sand routes so + the 2x2 recipes remain available for Mineralogy bricks. The six shared + andesite, diorite and granite slab recipes plus all nine matching stonecutter + routes now produce Mineralogy's more capable slabs, while the vanilla slabs + remain registered and tag-compatible. Twelve exact shapeless compatibility + recipes convert each raw or polished Mineralogy slab to its matching vanilla + 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.18'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. Sixteen + conditional JSON overrides cover furnaces, brewing stands, redstone and + conversion recipes, and all stone tools without changing their IDs, + patterns, outputs or other ingredients. Disabled mode restores the native + ingredients and keeps blackstone, chert and pumice valid. Matching-slab + rock-furnace upgrades and vanilla cobblestone construction recipes remain + distinct. +- Prevented Forge 40 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 + Brazilian and European Portuguese, Canadian French, Japanese, Korean, and + Russian. +- Added first-start player, developer, content, provider, and version guides, + plus an exact provider example. Existing exported guides are never + overwritten. Forge 40 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. +- Added independent, atomic migration of valid non-default legacy ore settings + into a Mineralogy OreSpawn provider override, including deterministic reports + and exclusive-to-inclusive maximum-height conversion. +- Mineralogy 6.0 JSON upgrades now retain the original global and per-world + geology files byte-for-byte while mapping their old block-named rock and ore + 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.18-native wall tall-side blockstates and models, wall/item tags, + loot tables, fluid APIs, rendering setup, and pack format 9 resources. +- Added reproducible Java 17 main, sources, and Javadoc artifacts, exact released + OreSpawn dependency verification, guarded 1.18.2 CI, and the four-component + release tag `6.1.0.118021`. +- Kept ForgeGradle 7 while sealing Forge 40's required Mavenizer compatibility + 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. +- 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 + `zone.moddev.mc.mineralogy:Mineralogy`, its generated POM, and the jar's + `Maven-Artifact` manifest entry. diff --git a/README.md b/README.md index 85f589796..fd117a663 100644 --- a/README.md +++ b/README.md @@ -1,62 +1,39 @@ -# Minecraft Mineralogy 6 +[![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.18.2)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.18.2) -Mineralogy adds real-world rock types to Minecraft 1.18.2, together with -matching slabs, stairs, walls, bricks, polished blocks, reliefs, and furnaces. -It also supplies sulfur, phosphorous, nitrate, rock salt lighting, and crude -oil content. +# Mineralogy 6 for Minecraft 1.18.2 -Mineralogy 6 requires **OreSpawn 4**. Mineralogy owns the blocks, items, -recipes, loot, textures, tags, and old-world compatibility. OreSpawn owns -terrain replacement, geological regions, formations, ore and fluid-deposit placement, -world profiles, configuration screens, retrogen, and the public worldgen API. +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. -## Players +This branch builds Mineralogy `6.1.0.118021` for Forge `40.3.0` and is built +and tested against OreSpawn `4.0.10.118021`. Its declared compatibility range is +OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers. -Install matching Minecraft 1.18.2 builds of Mineralogy 6 and OreSpawn 4 on the -client and server. When creating a world, open **OreSpawn World Generation** to -choose the recommended settings or tune the geology. Its **Help & Guide** -button explains the controls in game. +## Configuration and help -Mineralogy rocks work as stone or cobblestone where appropriate. Matching -rocks can also make their own furnaces and decorative block families. +Mineralogy's content and recipe switches remain in +`config/mineralogy-common.toml`. Use OreSpawn's world-creation UI or saved world +profile for rock, ore, fluid, dimension, altitude, and terrain-host settings. +Generation changes apply to new chunks only. -Five names now have vanilla equivalents: andesite, basalt, diorite, granite, -and tuff. New terrain uses the vanilla blocks by default. Mineralogy's versions -remain registered so old worlds still load and pack authors can select them. +After the first start, the complete human guide is available under +`config/mineralogy-guide/`. The maintained source is in [docs](docs/README.md) +and covers upgrades, content controls, pack overrides, provider data, and +four-component release versions. -## Configuration +## Compatibility -- `config/mineralogy-common.toml` controls Mineralogy content and recipes. -- `config/orespawn-worldgen.json` controls installed-pack worldgen defaults. -- `/serverconfig/orespawn-worldgen.json` is the world's complete - snapshot and can be copied with the world to a dedicated server. -- `config/mineralogy-orespawn.json` may override Mineralogy's packaged OreSpawn - provider for a modpack. -- `config/mineralogy-guide/` is written on first load with Mineralogy's player, - content, and provider documentation. -- `config/orespawn-guide/` contains the full engine, API, schema, template, and - dimension documentation. +The `mineralogy` mod ID and historical block, item, tile, NBT, recipe, asset, +patch, and pre-flattening world-conversion identities are retained. Existing +Mineralogy 5 configuration is read without being rewritten. Established worlds +continue through OreSpawn's migrated Cyano/geome profile unless their owner +explicitly selects a different engine. -Configuration changes affect newly generated chunks. Existing terrain is not -rewritten. - -## Developers - -Start with [the developer guide](docs/DEVELOPER_GUIDE.md) and -[provider notes](docs/PROVIDER.md). Integrations should use OreSpawn's supported -API and provider format rather than calling Mineralogy internals. - -Mineralogy requires Java 17. Build from the repository root with: - -```powershell -.\gradlew.bat build --no-daemon -``` - -Private `AGENTS.md` and `agent-notes/` files are local workspace context and are -ignored. Tracked public guidance lives under `docs/` and is packaged in the jar. - -## Links - -- [CurseForge](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) -- [Issues](https://github.com/SkyBlade1978/MinecraftMineralogy/issues) -- [Minecraft Mod Development Discord](https://discord.mcmoddev.com) +[CurseForge](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) · +[Source and issues](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy) · +[MMD Discord](https://discord.moddev.zone) diff --git a/build.gradle b/build.gradle index 9bd0ccd6b..a5680dcd9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,490 +1,1007 @@ +import groovy.json.JsonSlurper +import groovy.xml.XmlSlurper +import java.security.MessageDigest +import java.util.zip.ZipFile +import org.apache.tools.ant.filters.FixCrLfFilter + plugins { + id 'java' id 'eclipse' id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'net.minecraftforge.renamer' version '1.1.5' + id 'net.minecraftforge.gradle' version '7.0.34' } -version = mod_version -group = mod_group_id +def mavenizerCompatibilityJar = layout.projectDirectory.file( + 'ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-1.18.jar') +def mavenizerCompatibilitySha256 = + '28A6697BDF6D9500EC0AF9C1C949B9F3ED7DDFDA649CB5CAC4BEEA2E9567570A' + +// ForgeGradle 7's Mavenizer recompilation rejects a redundant accessor emitted +// by Forge 40's 1.18.2 decompiler. This checksum-sealed build-only variant +// removes that accessor; Mineralogy itself remains Java 17 bytecode. +fgtools.configure('mavenizer') { + classpath.from(mavenizerCompatibilityJar) + mainClass.set('net.minecraftforge.mcmaven.cli.Main') + javaLauncher.set(javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(25) + vendor = JvmVendorSpec.ADOPTIUM + }) +} -base { - archivesName = "Mineralogy-${minecraft_version}" +version = project.mod_version +group = project.mod_group +base.archivesName = 'Mineralogy' + +// Eclipse imports this nested checkout under its folder name. Keep the +// generated project and Forge launch configurations aligned with that stable +// workspace identity rather than Gradle's publication-facing root name. +def eclipseWorkspaceProjectName = projectDir.name +eclipse { + project { + name = eclipseWorkspaceProjectName + } +} + +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] != '118021') { + throw new GradleException("Mineralogy 1.18.2 Forge releases must use target 118021: ${project.mod_version}") } -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. java { - toolchain.languageVersion = JavaLanguageVersion.of(17) + toolchain { + languageVersion = JavaLanguageVersion.of(17) + vendor = JvmVendorSpec.ADOPTIUM + } withSourcesJar() withJavadocJar() } -println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" -minecraft { - // The mappings can be changed at any time and must be in the following format. - // Channel: Version: - // official MCVersion Official field/method names from Mojang mapping files - // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official - // - // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge - // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started - // - // Use non-default mappings at your own risk. They may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: mapping_channel, version: mapping_version - - // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. - // In most cases, it is not necessary to enable. - // enableEclipsePrepareRuns = true - // enableIdeaPrepareRuns = true - - // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. - // It is REQUIRED to be set to true for this template to function. - // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html - copyIdeResources = true - - // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. - // The folder name can be set on a run configuration using the "folderName" property. - // By default, the folder name of a run configuration is the name of the Gradle project containing it. - // generateRunFolders = true - - // This property enables access transformers for use in development. - // They will be applied to the Minecraft artifact. - // The access transformer file can be anywhere in the project. - // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. - // This default location is a best practice to automatically put the file in the right place in the final jar. - // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. - runs { - // applies to all the run configs below - configureEach { - workingDirectory project.file('run') +tasks.named('sourcesJar', Jar) { + includeEmptyDirs = false + exclude 'com/mcmoddev/mineralogy/**' +} - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' +tasks.withType(JavaCompile).configureEach { + javaCompiler = javaToolchains.compilerFor { + languageVersion = JavaLanguageVersion.of(17) + vendor = JvmVendorSpec.ADOPTIUM + } + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + options.encoding = 'UTF-8' + options.compilerArgs.addAll(['-Xlint:deprecation', '-Xmaxerrs', '1000']) +} - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' +tasks.named('compileTestJava', JavaCompile) { + options.compilerArgs.add('-proc:none') +} - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - property 'forge.enabledGameTestNamespaces', mod_id +minecraft { + mappings channel: project.mcp_mappings_channel, version: project.mcp_mappings_version + runs { + configureEach { + workingDir.convention layout.projectDirectory.dir( + providers.gradleProperty('runDirectory').getOrElse('run')) + jvmArgs '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED' + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' mods { - mineralogy { - source sourceSets.main - } + mineralogy { source sourceSets.main } } } - - client { - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - property 'forge.enabledGameTestNamespaces', mod_id - } - - server { - property 'forge.enabledGameTestNamespaces', mod_id + register('client') + register('server') { args '--nogui' } + } +} - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. - gameTestServer { - property 'forge.enabledGameTestNamespaces', mod_id - if (providers.gradleProperty('orespawnBenchmarkMode').isPresent()) { - property 'orespawn.worldgenBenchmarkMode', providers.gradleProperty('orespawnBenchmarkMode').get() - property 'orespawn.worldgenBenchmarkRadius', - providers.gradleProperty('orespawnBenchmarkRadius').getOrElse('4') - property 'orespawn.worldgenBenchmarkRepetitions', - providers.gradleProperty('orespawnBenchmarkRepetitions').getOrElse('3') - property 'orespawn.worldgenBenchmarkVanillaOres', - providers.gradleProperty('orespawnBenchmarkVanillaOres').getOrElse('false') - property 'orespawn.worldgenBenchmarkOreAudit', - providers.gradleProperty('orespawnBenchmarkOreAudit').getOrElse('false') - if (providers.gradleProperty('orespawnBenchmarkBlockAudit').isPresent()) { - property 'orespawn.worldgenBenchmarkBlockAudit', - providers.gradleProperty('orespawnBenchmarkBlockAudit').get() - } - property 'orespawn.worldgenBenchmarkCenterX', - providers.gradleProperty('orespawnBenchmarkCenterX').getOrElse('256') - property 'orespawn.worldgenBenchmarkCenterZ', - providers.gradleProperty('orespawnBenchmarkCenterZ').getOrElse('256') - property 'orespawn.worldgenBenchmarkCenterStep', - providers.gradleProperty('orespawnBenchmarkCenterStep').getOrElse('64') - property 'orespawn.worldgenBenchmarkDimension', - providers.gradleProperty('orespawnBenchmarkDimension').getOrElse('overworld') - if (providers.gradleProperty('orespawnBenchmarkBiomeType').isPresent()) { - property 'orespawn.worldgenBenchmarkBiomeType', - providers.gradleProperty('orespawnBenchmarkBiomeType').get() - } - property 'orespawn.worldgenBenchmarkStopServer', 'true' - } - } - - data { - // example of overriding the workingDirectory set in configureEach above - workingDirectory project.file('run-data') +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 40 development discovery.' + dependsOn tasks.named('classes') + from sourceSets.main.output.classesDirs + from sourceSets.main.output.resourcesDir + into developmentModOutput +} - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') +def configureForge40Run = { JavaExec runTask, String launchTarget -> + runTask.dependsOn prepareDevelopmentMod + runTask.environment 'MOD_CLASSES', "mineralogy%%${developmentModOutput.get().asFile}" + runTask.doFirst { + // 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') + if (!modsDirectory.isDirectory() && !modsDirectory.mkdirs()) { + throw new GradleException("Could not create development mods directory: ${modsDirectory}") } } } -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } +tasks.withType(JavaExec).configureEach { JavaExec runTask -> + String launchTarget = [runClient: 'fmluserdevclient', runServer: 'fmluserdevserver'][runTask.name] + if (launchTarget != null) configureForge40Run(runTask, launchTarget) +} +def orespawnModule = "mmd-orespawn-${project.orespawn_curse_project_id}" +def orespawnVerificationRepository = project.findProperty('orespawnVerificationRepository') repositories { - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: - flatDir { - dirs rootProject.file('../../OS118/OreSpawn/build/libs') + minecraft.mavenizer(it) + maven fg.forgeMaven + maven fg.minecraftLibsMaven + mavenCentral() + + // The staged CI mirror is the only permitted source for this exact + // OreSpawn module. Without exclusive routing, a transient HTTP error from + // Maven Central aborts resolution before Gradle reaches the verified jar. + exclusiveContent { + forRepository { + maven { + name = orespawnVerificationRepository == null + ? 'CurseMaven' + : 'OreSpawnReleaseVerificationMirror' + url = orespawnVerificationRepository == null + ? uri('https://www.cursemaven.com') + : uri(orespawnVerificationRepository) + metadataSources { artifact() } + } + } + filter { + includeModule('curse.maven', orespawnModule) + } } } +configurations { + orespawnRelease +} + dependencies { - // Specify the version of Minecraft to use. - // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. - // The "userdev" classifier will be requested and setup by ForgeGradle. - // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], - // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + 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}") + 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}" +} + +tasks.withType(Test).configureEach { + workingDir = project.projectDir +} - // OreSpawn owns all geology and managed ore generation in Mineralogy 6. - runtimeOnly fg.deobf("blank:OreSpawn-${minecraft_version}:${orespawn_version}") +javadoc { + failOnError = false + options.encoding = 'UTF-8' + options.addStringOption('Xdoclint:none', '-quiet') + options.addBooleanOption('notimestamp', true) +} - testImplementation platform('org.junit:junit-bom:5.10.2') - testImplementation 'org.junit.jupiter:junit-jupiter' +tasks.withType(AbstractArchiveTask).configureEach { + preserveFileTimestamps = false + reproducibleFileOrder = true +} - // Real mod deobf dependency examples - these get remapped to your current mappings - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency - // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency - // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency +processResources { + inputs.property 'version', project.version + inputs.property 'mc_version', project.mc_version + inputs.property 'forge_version', project.forge_version - // Example mod dependency using a mod jar from ./libs with a flat dir repository - // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar - // The group id is ignored when searching -- in this case, it is "blank" - // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + filesMatching('META-INF/mods.toml') { + expand version: project.version, + mc_version: project.mc_version, + forge_version: project.forge_version + } - // For more info: - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html + from('docs') { + into 'META-INF/mineralogy/docs' + } + from('src/main/resources/data/mineralogy/orespawn/provider.json') { + into 'META-INF/mineralogy/docs/examples' + rename 'provider.json', 'mineralogy-provider.json' + } } -// Example for how to get properties into the manifest for reading at runtime. -tasks.named('jar', Jar).configure { +tasks.named('jar', Jar) { + archiveClassifier = 'deobf' + destinationDirectory = layout.buildDirectory.dir('libs-dev') manifest { attributes([ - 'Specification-Title' : 'Mineralogy', - 'Specification-Vendor' : 'SkyBlade1978', - 'Specification-Version' : '1', // We are version 1 of ourselves - 'Implementation-Title' : project.name, - 'Implementation-Version' : project.jar.archiveVersion, - 'Implementation-Vendor' : 'SkyBlade1978', - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + 'Maven-Artifact' : "${project.group}:${base.archivesName.get()}:${project.version}", + 'Specification-Title' : 'Mineralogy', + 'Specification-Vendor' : 'SkyBlade1978', + 'Specification-Version' : '1', + 'Implementation-Title' : 'Mineralogy', + 'Implementation-Version': project.version, + 'Implementation-Vendor' : 'SkyBlade1978', + 'Built-On-Java' : '17', + 'Built-On' : "${project.mc_version}-${project.forge_version}" ]) } - - // This is the preferred method to reobfuscate your jar file - finalizedBy 'reobfJar' } -tasks.named('processResources', ProcessResources).configure { - from('docs/AGENTS.md') { - into '' - rename { 'AGENTS.md' } +eclipse { + classpath { + downloadSources = true + downloadJavadoc = true } - from('docs') { - into 'META-INF/mineralogy/docs' + synchronizationTasks 'isolateEclipseProductionRuns' +} + +idea { + module { + downloadSources = true + downloadJavadoc = true } } -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing: -// tasks.named('publish').configure { -// dependsOn 'reobfJar' -// } +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") +} + +['apiElements', 'runtimeElements'].each { configurationName -> + configurations.named(configurationName) { artifacts.clear() } + artifacts { add(configurationName, releaseJar) } +} + +tasks.named('assemble') { + dependsOn releaseJar + dependsOn tasks.named('sourcesJar') + dependsOn tasks.named('javadocJar') +} + +def mainReleaseName = "Mineralogy-${project.version}.jar" +def sourcesReleaseName = "Mineralogy-${project.version}-sources.jar" +def javadocReleaseName = "Mineralogy-${project.version}-javadoc.jar" +def expectedReleaseNames = [mainReleaseName, sourcesReleaseName, javadocReleaseName] +def expectedMavenGroup = 'zone.moddev.mc.mineralogy' +def expectedMavenArtifact = 'Mineralogy' +def expectedMavenCoordinate = "${expectedMavenGroup}:${expectedMavenArtifact}:${project.version}" +def preparedReleaseDir = project.findProperty('preparedReleaseDir') +def mavenUploadUrl = System.getenv('MAVEN_UPLOAD_URL') ?: 'https://invalid.invalid/missing-maven-upload-url' +def mavenUploadUsername = System.getenv('MAVEN_UPLOAD_USERNAME') ?: '' +def mavenUploadPassword = System.getenv('MAVEN_UPLOAD_PASSWORD') ?: '' publishing { publications { - register('mavenJava', MavenPublication) { - artifact jar - artifact sourcesJar - artifact javadocJar + mavenJava(MavenPublication) { + groupId = project.group + artifactId = expectedMavenArtifact + version = project.version + if (preparedReleaseDir != null) { + artifact new File(preparedReleaseDir.toString(), mainReleaseName) + artifact(new File(preparedReleaseDir.toString(), sourcesReleaseName)) { + classifier = 'sources' + } + artifact(new File(preparedReleaseDir.toString(), javadocReleaseName)) { + classifier = 'javadoc' + } + } + else { + artifact releaseJar + artifact tasks.named('sourcesJar') + artifact tasks.named('javadocJar') + } + pom.withXml { + def root = asNode() + root.appendNode('name', 'Minecraft Mineralogy') + root.appendNode('description', 'Geologically themed rocks, minerals, building blocks, and OreSpawn provider data.') + root.appendNode('url', 'https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy') + def license = root.appendNode('licenses').appendNode('license') + license.appendNode('name', 'GNU Lesser General Public License, Version 2.1') + license.appendNode('url', 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt') + } } } repositories { maven { - url "file://${project.projectDir}/mcmodsrepo" + name = 'release' + url = uri(mavenUploadUrl) + credentials { + username = mavenUploadUsername + password = mavenUploadPassword + } } } } -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +tasks.register('verifyMavenCoordinates') { + group = 'verification' + description = 'Verifies the generated POM uses Mineralogy\'s mod-specific Maven namespace.' + dependsOn tasks.named('generatePomFileForMavenJavaPublication') + doLast { + File pomFile = file("${buildDir}/publications/mavenJava/pom-default.xml") + if (!pomFile.isFile()) { + throw new GradleException("Generated Maven POM does not exist: ${pomFile}") + } + def pom = new XmlSlurper(false, false).parse(pomFile) + def actual = [pom.groupId.text(), pom.artifactId.text(), pom.version.text()] + def expected = [expectedMavenGroup, expectedMavenArtifact, project.version.toString()] + if (project.group.toString() != expectedMavenGroup || actual != expected) { + throw new GradleException("Expected Maven coordinate ${expected.join(':')}, found ${actual.join(':')}") + } + } } -tasks.named('javadoc', Javadoc).configure { - options.encoding = 'UTF-8' - options.addStringOption('Xdoclint:none', '-quiet') +tasks.register('verifyMavenizerCompatibilityFixture') { + group = 'verification' + description = 'Verifies the sealed Forge 1.18.2 Mavenizer compatibility fixture.' + inputs.file mavenizerCompatibilityJar + doLast { + File fixture = mavenizerCompatibilityJar.asFile + if (!fixture.isFile()) { + throw new GradleException("Missing Mavenizer compatibility fixture: ${fixture}") + } + MessageDigest digest = MessageDigest.getInstance('SHA-256') + fixture.withInputStream { input -> + byte[] buffer = new byte[8192] + for (int read = input.read(buffer); read >= 0; read = input.read(buffer)) { + if (read > 0) digest.update(buffer, 0, read) + } + } + String actual = digest.digest().encodeHex().toString().toUpperCase() + if (actual != mavenizerCompatibilitySha256) { + throw new GradleException("Mavenizer compatibility fixture checksum mismatch: ${actual}") + } + } } -tasks.named('test', Test).configure { - useJUnitPlatform() +tasks.register('verifyReleaseConfiguration') { + group = 'verification' + description = 'Verifies the exact Mineralogy 1.18.2 release identity.' + dependsOn tasks.named('verifyMavenizerCompatibilityFixture') + doLast { + if (project.mod_version != '6.1.0.118021' + || project.mod_group != expectedMavenGroup + || project.minecraft_version != '1.18.2' + || project.forge_version != '40.3.0' + || project.mcp_mappings_channel != 'official' + || project.mcp_mappings_version != '1.18.2') { + throw new GradleException('Unexpected Mineralogy 1.18.2 release identity') + } + } } -// Keep every Eclipse launch input on Buildship's physical Gradle cache. Command-line -// verification may deliberately use a separate cache, which must not leak into Eclipse. -def syncEclipseRunClasspaths = tasks.register('syncEclipseRunClasspaths') { - group = 'IDE' - description = 'Aligns Eclipse project, Buildship, and Forge run classpaths with Eclipse\'s Gradle home.' - +tasks.register('verifyReleaseDependencies') { + group = 'verification' + description = 'Resolves and verifies the exact released OreSpawn dependency.' doLast { - File classpathDir = layout.buildDirectory.dir('classpath').get().asFile - Set classpathFiles = fileTree(classpathDir) { - include '*_minecraftClasspath.txt' - }.files - if (classpathFiles.isEmpty()) { - throw new GradleException('Missing Forge run classpaths. Run genEclipseRuns before launching from Eclipse.') + if (project.mod_version != '6.1.0.118021' + || project.minecraft_version != project.mc_version + || project.mc_version != '1.18.2' + || 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.curseforge_project_id != '240974') { + throw new GradleException('Unexpected generic release dispatcher metadata') } + if (project.orespawn_version != '4.0.10.118021' || + project.orespawn_curse_project_id != '245586' || + project.orespawn_curse_file_id != '8750114') { + throw new GradleException('Unexpected OreSpawn release coordinates') + } + File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts + .find { it.moduleVersion.id.group == 'curse.maven' && it.file.name.endsWith('.jar') }?.file + if (artifact == null || !artifact.isFile()) { + throw new GradleException('Released OreSpawn artifact did not resolve') + } + String sha = MessageDigest.getInstance('SHA-256').digest(artifact.bytes).encodeHex().toString().toUpperCase() + if (sha != project.orespawn_sha256) { + throw new GradleException("OreSpawn SHA-256 mismatch: ${sha}") + } + } +} - File buildshipPreferences = file('.settings/org.eclipse.buildship.core.prefs') - Properties buildship = new Properties() - if (buildshipPreferences.isFile()) { - buildshipPreferences.withInputStream { buildship.load(it) } - } - String configuredGradleHome = buildship.getProperty('connection.gradle.user.home', '').trim() - File eclipseProjectClasspath = file('.classpath') - String eclipseGradleHomeOverride = (findProperty('eclipseGradleUserHome') - ?: System.getenv('ECLIPSE_GRADLE_USER_HOME') ?: '').toString().trim() - File eclipseGradleHome = eclipseGradleHomeOverride - ? file(eclipseGradleHomeOverride).canonicalFile - : new File(System.getProperty('user.home'), '.gradle').canonicalFile - Map requiredBuildshipSettings = [ - 'eclipse.preferences.version' : '1', - 'connection.gradle.distribution' : 'GRADLE_DISTRIBUTION(WRAPPER)', - 'connection.gradle.user.home' : eclipseGradleHome.absolutePath, - 'connection.project.dir' : '', - 'override.workspace.settings' : 'false', - 'project.path' : ':' - ] - boolean buildshipChanged = !configuredGradleHome || - file(configuredGradleHome).canonicalFile != eclipseGradleHome - requiredBuildshipSettings.each { String key, String value -> - if (buildship.getProperty(key) != value) { - buildship.setProperty(key, value) - buildshipChanged = true - } - } - if (buildshipChanged) { - buildshipPreferences.parentFile.mkdirs() - buildshipPreferences.withOutputStream { - buildship.store(it, - 'Generated by syncEclipseRunClasspaths; keep Eclipse launch inputs on the Buildship cache.') - } - } - File eclipseCache = new File(eclipseGradleHome, 'caches').canonicalFile - File eclipseClasspathDir = file('.settings/mineralogy-run-classpaths') - eclipseClasspathDir.mkdirs() - - Closure mapCacheReferences = { String value -> - value.replaceAll(/(?i)[A-Z]:[\\\/]\S*?[\\\/]caches(?=[\\\/])/) { String cacheRoot -> - cacheRoot.contains('/') - ? eclipseCache.absolutePath.replace('\\', '/') - : eclipseCache.absolutePath - } - } - - Map stableClasspaths = [:] - classpathFiles.each { File classpathFile -> - List original = classpathFile.readLines('UTF-8') - List synced = original.collect { String entry -> - String mapped = mapCacheReferences(entry) - String portable = mapped.replace('\\', '/') - int marker = portable.indexOf('/caches/') - if (marker < 0) { - return mapped - } - - File target = file(mapped).canonicalFile - if (!target.isFile()) { - throw new GradleException("Missing Eclipse run dependency in configured Gradle cache: ${target}") +tasks.register('verifyReleaseArtifacts') { + group = 'verification' + description = 'Audits the three distributable jars and their production contents.' + dependsOn tasks.named('verifyReleaseConfiguration') + dependsOn tasks.named('assemble') + doLast { + File libs = file("${buildDir}/libs") + def actual = fileTree(libs) { include 'Mineralogy-*.jar' }.files.collect { it.name }.sort() + def expectedSorted = expectedReleaseNames.collect().sort() + if (actual != expectedSorted) { + throw new GradleException("Expected exactly ${expectedSorted}, found ${actual}") + } + expectedReleaseNames.each { artifactName -> + ZipFile artifactZip = new ZipFile(new File(libs, artifactName)) + try { + def artifactNames = artifactZip.entries().collect { it.name } + 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/test/') || + it.startsWith('ci-fixtures/') || it.contains('minecraft-mavenizer') || + it.startsWith('src/test/') || + it == 'AGENTS.md' || it.contains('/agent-notes/') }) { + throw new GradleException("${artifactName} contains a retired, test, probe, or agent-only path") } - return target.absolutePath } - - File stableClasspath = new File(eclipseClasspathDir, classpathFile.name) - stableClasspath.setText(synced.join(System.lineSeparator()) + System.lineSeparator(), 'UTF-8') - stableClasspaths.put(classpathFile.canonicalFile, stableClasspath.canonicalFile) + finally { + artifactZip.close() + } } - - int changedProjectClasspath = 0 - int changedResourceExclusions = 0 - if (eclipseProjectClasspath.isFile()) { - String original = eclipseProjectClasspath.getText('UTF-8') - def parsedClasspath = new XmlParser(false, false).parseText(original) - parsedClasspath.classpathentry.each { entry -> - ['path', 'sourcepath'].each { String attribute -> - String value = entry.attribute(attribute) - if (!value) { - return - } - String mapped = mapCacheReferences(value) - if (mapped == value) { - return - } - File mappedTarget = file(mapped).canonicalFile - if (mappedTarget.exists()) { - entry.attributes().put(attribute, mappedTarget.absolutePath) - changedProjectClasspath = 1 - } else { - // Test-only libraries may have been resolved by command-line Gradle - // but not yet by Buildship. They are not part of the Forge launch - // module path, so retaining the existing valid path is safe. - File existingTarget = file(value).canonicalFile - if (!existingTarget.exists()) { - throw new GradleException("Missing Eclipse project dependency in both Gradle caches: ${mappedTarget}") - } - } + File main = new File(libs, mainReleaseName) + ZipFile zip = new ZipFile(main) + try { + def names = zip.entries().collect { it.name } as Set + [ + 'META-INF/mods.toml', + 'data/mineralogy/orespawn/provider.json', + 'META-INF/mineralogy/docs/README.md', + 'META-INF/mineralogy/docs/examples/mineralogy-provider.json', + 'assets/mineralogy/lang/en_us.json' + ].each { required -> + if (!names.contains(required)) throw new GradleException("Release jar is missing ${required}") + } + def manifestEntry = zip.getEntry('META-INF/MANIFEST.MF') + if (manifestEntry == null) throw new GradleException('Release jar is missing META-INF/MANIFEST.MF') + def manifestStream = zip.getInputStream(manifestEntry) + try { + def manifest = new java.util.jar.Manifest(manifestStream) + def actualMavenCoordinate = manifest.mainAttributes.getValue('Maven-Artifact') + if (actualMavenCoordinate != expectedMavenCoordinate) { + throw new GradleException("Expected manifest Maven-Artifact ${expectedMavenCoordinate}, found ${actualMavenCoordinate}") } } - parsedClasspath.classpathentry.findAll { entry -> - entry.attribute('kind') == 'src' && entry.attribute('path') == 'src/main/resources' - }.each { entry -> - List exclusions = (entry.attribute('excluding') ?: '') - .split(/\|/) - .findAll { !it.isEmpty() } - ['META-INF/mods.toml', 'pack.mcmeta'].each { String metadataFile -> - if (exclusions.remove(metadataFile)) { - changedResourceExclusions = 1 + finally { + manifestStream.close() + } + 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/test/') || + it.startsWith('ci-fixtures/') || it.contains('minecraft-mavenizer') || + it == 'AGENTS.md' || it.contains('/agent-notes/') }) { + throw new GradleException('Release jar contains a retired, test, probe, or agent-only path') + } + def locales = names.findAll { it ==~ /assets\/mineralogy\/lang\/[a-z_]+\.json/ } + if (locales.size() != 17) { + throw new GradleException("Release jar must contain 17 locales, found ${locales.size()}") + } + zip.entries().findAll { !it.directory && it.name.endsWith('.class') }.each { entry -> + byte[] header = new byte[8] + def stream = zip.getInputStream(entry) + try { + if (stream.read(header) != 8 || header[0..3] != [(byte) 0xca, (byte) 0xfe, (byte) 0xba, (byte) 0xbe]) { + 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 (exclusions.isEmpty()) { - entry.attributes().remove('excluding') - } else { - entry.attributes().put('excluding', exclusions.join('|')) + finally { + stream.close() } } - if (changedProjectClasspath || changedResourceExclusions) { - eclipseProjectClasspath.setText(groovy.xml.XmlUtil.serialize(parsedClasspath), 'UTF-8') + def provider = new JsonSlurper().parse(zip.getInputStream(zip.getEntry('data/mineralogy/orespawn/provider.json'))) + if (provider.schema_version != 4 || provider.provider_revision != 3 || + provider.rocks.size() != 32 || provider.ores.size() != 3 || provider.fluid_deposits.size() != 1) { + throw new GradleException('Packaged provider contract is invalid') } - - parsedClasspath.classpathentry.each { entry -> - ['path', 'sourcepath'].each { String attribute -> - String value = entry.attribute(attribute) - if (value && value.replace('\\', '/').contains('/caches/')) { - File target = file(value).canonicalFile - if (!target.exists()) { - throw new GradleException("Missing Eclipse project dependency in configured Gradle cache: ${target}") + def oil = provider.fluid_deposits['mineralogy:fluid_deposit/crude_oil'] + ?.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.18.2 world heights') + } + if (provider.rocks['mineralogy:rock/minecraft/basalt']?.block != 'minecraft:basalt' || + provider.rocks['mineralogy:rock/minecraft/tuff']?.block != 'minecraft:tuff' || + provider.profile_defaults?.worldgen_aliases != [ + 'mineralogy:andesite': 'minecraft:andesite', + 'mineralogy:basalt': 'minecraft:basalt', + 'mineralogy:diorite': 'minecraft:diorite', + 'mineralogy:granite': 'minecraft:granite', + 'mineralogy:tuff': 'minecraft:tuff' + ] || provider.profile_defaults?.terrain_dimensions?.get('minecraft:overworld')?.host_blocks != + ['minecraft:stone', 'minecraft:deepslate'] || + !provider.ores.values().every { ore -> + 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.18.2 native-rock and deepslate contract') + } + byte[] providerBytes = zip.getInputStream( + zip.getEntry('data/mineralogy/orespawn/provider.json')).bytes + byte[] exampleBytes = zip.getInputStream(zip.getEntry( + 'META-INF/mineralogy/docs/examples/mineralogy-provider.json')).bytes + if (!java.util.Arrays.equals(providerBytes, exampleBytes)) { + throw new GradleException('Packaged provider example differs from the authoritative provider') + } + String recipePrefix = 'data/mineralogy/recipes/' + String advancementPrefix = 'data/mineralogy/advancements/recipes/' + def recipes = names.findAll { it.startsWith(recipePrefix) && it.endsWith('.json') && + !it.substring(recipePrefix.length()).contains('/') } + def advancements = names.findAll { it.startsWith(advancementPrefix) && it.endsWith('.json') && + !it.substring(advancementPrefix.length()).contains('/') } + 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 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())) + }) { + throw new GradleException("Invalid Minecraft 1.18.2 item predicate in ${source}: ${criterionName}") } } } } + names.findAll { + it.startsWith('data/mineralogy/advancements/') && it.endsWith('.json') && + !it.endsWith('/_factories.json') + }.each { entryName -> + def advancement = new JsonSlurper().parse(zip.getInputStream(zip.getEntry(entryName))) + if (advancement.criteria != null) verifyAdvancementPredicates(advancement, entryName) + } + def slabBridges = ['andesite', 'diorite', 'granite'].collectMany { family -> + [ + [name: "${family}_slab_to_vanilla", source: "mineralogy:${family}_slab", result: "minecraft:${family}_slab"], + [name: "${family}_slab_from_vanilla", source: "minecraft:${family}_slab", result: "mineralogy:${family}_slab"], + [name: "${family}_smooth_slab_to_vanilla", source: "mineralogy:${family}_smooth_slab", result: "minecraft:polished_${family}_slab"], + [name: "${family}_smooth_slab_from_vanilla", source: "minecraft:polished_${family}_slab", result: "mineralogy:${family}_smooth_slab"] + ] + } + slabBridges.each { bridge -> + def recipe = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( + "data/mineralogy/recipes/${bridge.name}.json"))) + 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) { + throw new GradleException("Invalid native/Mineralogy slab conversion: ${bridge.name}") + } + } + def minecraftRecipes = names.findAll { it.startsWith('data/minecraft/recipes/') && it.endsWith('.json') } + def cobblestoneOverrides = ['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'] + def slabOverrides = ['andesite', 'diorite', 'granite'].collectMany { family -> + ["${family}_slab", "polished_${family}_slab", + "${family}_slab_from_${family}_stonecutting", + "polished_${family}_slab_from_${family}_stonecutting", + "polished_${family}_slab_from_polished_${family}_stonecutting"] + } + def polishedOverrides = ['andesite', 'basalt', 'diorite', 'granite'].collect { + "polished_${it}" + } + def expectedMinecraftRecipes = (cobblestoneOverrides + slabOverrides + polishedOverrides).collect { + "data/minecraft/recipes/${it}.json" + } as Set + if ((minecraftRecipes as Set) != expectedMinecraftRecipes || minecraftRecipes.size() != 35) { + throw new GradleException('Release jar must contain exactly 16 cobblestone, 15 slab, and four polished-block recipe overrides') + } + 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') { + throw new GradleException("Invalid conditional cobblestone override: ${recipe}") + } + if (recipe.startsWith('mossy_cobblestone_from_') && + !data.recipes.every { it.recipe?.group == 'mossy_cobblestone' }) { + throw new GradleException("Mossy cobblestone override lost its vanilla recipe group: ${recipe}") + } + } + 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') { + throw new GradleException("Invalid conditional Mineralogy slab override: ${recipe}") + } + } + def families = ['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'] + def unionTags = [ + cobblestone_equivalents: '#forge:cobblestone', + stone_crafting_materials: '#minecraft:stone_crafting_materials', + stone_tool_materials: '#minecraft:stone_tool_materials' + ] + unionTags.each { tag, base -> + def entry = zip.getEntry("data/mineralogy/tags/items/${tag}.json") + def values = entry == null ? [] : new JsonSlurper().parse(zip.getInputStream(entry)).values + def expected = [base] + families.collect { "#mineralogy:stones/${it}" } + if (values != expected) throw new GradleException("Invalid Mineralogy recipe union tag: ${tag}") + } + if (!families.every { names.contains("data/mineralogy/tags/blocks/stones/${it}.json".toString()) }) { + throw new GradleException('Release jar must contain all 27 raw-rock family block tags') + } + def advancementCategories = [ + furnace: 'decorations', brewing_stand: 'brewing', lever: 'redstone', + piston: 'redstone', dispenser: 'redstone', dropper: 'redstone', + observer: 'redstone', mossy_cobblestone_from_vine: 'building_blocks', + mossy_cobblestone_from_moss_block: 'building_blocks', + andesite: 'building_blocks', diorite: 'building_blocks', + stone_axe: 'tools', stone_hoe: 'tools', stone_pickaxe: 'tools', + stone_shovel: 'tools', stone_sword: 'combat' + ] + def expectedMinecraftAdvancements = advancementCategories.collect { recipe, category -> + "data/minecraft/advancements/recipes/${category}/${recipe}.json" + } as Set + expectedMinecraftAdvancements.addAll(['andesite', 'basalt', 'diorite', 'granite'].collect { + "data/minecraft/advancements/recipes/building_blocks/polished_${it}.json" + }) + def minecraftAdvancements = names.findAll { + it.startsWith('data/minecraft/advancements/recipes/') && it.endsWith('.json') + } as Set + if (minecraftAdvancements != expectedMinecraftAdvancements) { + throw new GradleException('Release jar must contain exactly 16 cobblestone and four polished-block advancement overrides') + } + advancementCategories.each { recipe, category -> + 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') { + throw new GradleException("Invalid conditional advancement override: ${recipe}") + } + data.advancements.eachWithIndex { branch, index -> + verifyAdvancementPredicates(branch.advancement, + "minecraft:${category}/${recipe} branch ${index}") + } + } + ['andesite', 'basalt', 'diorite', 'granite'].each { family -> + String entryName = "data/minecraft/advancements/recipes/building_blocks/polished_${family}.json" + def advancement = new JsonSlurper().parse(zip.getInputStream(zip.getEntry(entryName))) + verifyAdvancementPredicates(advancement, entryName) + } + 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 40 wall blockstates and tall-side models") + } + } + finally { + zip.close() } + } +} - File eclipseLaunchDir = file('.eclipse/configurations') - int changedPrepareLaunches = 0 - if (eclipseLaunchDir.isDirectory()) { - boolean windows = System.getProperty('os.name', '').toLowerCase().contains('windows') - File gradleWrapper = file(windows ? 'gradlew.bat' : 'gradlew').canonicalFile - String launcher = windows - ? (System.getenv('ComSpec') ?: new File(System.getenv('SystemRoot') ?: 'C:\\Windows', - 'System32\\cmd.exe').absolutePath) - : '/bin/sh' - String arguments = windows - ? "/d /s /c \"\\\"${gradleWrapper.absolutePath}\\\" copyEclipseResources --console plain\"" - : "-c \"'${gradleWrapper.absolutePath.replace("'", "'\\''")}' copyEclipseResources --console plain\"" - - fileTree(eclipseLaunchDir) { - include '*prepareRun*.launch' - }.files.each { File launchFile -> - StringWriter output = new StringWriter() - def xml = new groovy.xml.MarkupBuilder(output) - xml.mkp.xmlDeclaration(version: '1.0', encoding: 'UTF-8', standalone: 'no') - xml.launchConfiguration(type: 'org.eclipse.ui.externaltools.ProgramLaunchConfigurationType') { - booleanAttribute(key: 'org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND', value: 'true') - booleanAttribute(key: 'org.eclipse.ui.externaltools.ATTR_CAPTURE_OUTPUT', value: 'true') - stringAttribute(key: 'org.eclipse.ui.externaltools.ATTR_LOCATION', value: launcher) - booleanAttribute(key: 'org.eclipse.ui.externaltools.ATTR_SHOW_CONSOLE', value: 'true') - stringAttribute(key: 'org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS', value: arguments) - stringAttribute(key: 'org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY', - value: projectDir.canonicalPath) - mapAttribute(key: 'org.eclipse.debug.core.environmentVariables') { - mapEntry(key: 'GRADLE_USER_HOME', value: eclipseGradleHome.absolutePath) - mapEntry(key: 'JAVA_HOME', value: System.getProperty('java.home')) - } - } - String replacement = output.toString() + System.lineSeparator() - if (launchFile.getText('UTF-8') != replacement) { - launchFile.setText(replacement, 'UTF-8') - changedPrepareLaunches++ +tasks.register('writeReleaseChecksums') { + group = 'verification' + dependsOn tasks.named('verifyReleaseArtifacts') + doLast { + File output = file("${buildDir}/release/SHA256SUMS") + output.parentFile.mkdirs() + output.setText(expectedReleaseNames.collect().sort().collect { name -> + File artifact = file("${buildDir}/libs/${name}") + String hash = MessageDigest.getInstance('SHA-256').digest(artifact.bytes).encodeHex().toString() + "${hash} ${name}" + }.join('\n') + '\n', 'UTF-8') + } +} + +tasks.register('verifyPreparedReleaseArtifacts') { + group = 'verification' + description = 'Verifies the immutable artifact bundle supplied to Maven publication.' + inputs.files { + preparedReleaseDir == null ? [] : + (expectedReleaseNames + ['SHA256SUMS', 'CHANGELOG.txt']).collect { + new File(preparedReleaseDir.toString(), it) } + } + doLast { + if (preparedReleaseDir == null) { + throw new GradleException('preparedReleaseDir is required for prepared artifact publication') + } + File prepared = file(preparedReleaseDir.toString()) + if (!prepared.isDirectory()) { + throw new GradleException("Prepared release directory does not exist: ${prepared}") + } + + def expectedBundleNames = (expectedReleaseNames + ['SHA256SUMS', 'CHANGELOG.txt']).sort() + def actualBundleNames = prepared.listFiles().findAll { it.isFile() }.collect { it.name }.sort() + if (actualBundleNames != expectedBundleNames) { + throw new GradleException("Expected prepared bundle ${expectedBundleNames}, found ${actualBundleNames}") + } + + File checksumFile = new File(prepared, 'SHA256SUMS') + def declaredChecksums = [:] + checksumFile.readLines('UTF-8').findAll { !it.trim().isEmpty() }.each { line -> + def match = line =~ /^([0-9a-fA-F]{64}) (.+)$/ + if (!match.matches()) { + throw new GradleException("Invalid prepared checksum line: ${line}") } + declaredChecksums[match[0][2]] = match[0][1].toLowerCase() + } + if (declaredChecksums.keySet().sort() != expectedReleaseNames.sort()) { + throw new GradleException('Prepared checksums do not declare exactly the three release jars') } + declaredChecksums.each { name, expectedHash -> + File artifact = new File(prepared, name) + String actualHash = MessageDigest.getInstance('SHA-256') + .digest(artifact.bytes).encodeHex().toString() + if (actualHash != expectedHash) { + throw new GradleException("Prepared checksum mismatch for ${name}") + } + } + } +} - int changedLaunches = 0 - if (eclipseLaunchDir.isDirectory()) { - File eclipseClasses = file('bin/main').canonicalFile - String modClasses = "${mod_id}%%${eclipseClasses.absolutePath}" - fileTree(eclipseLaunchDir) { - include '*Slim.launch' - }.files.each { File launchFile -> - String original = launchFile.getText('UTF-8') - String synced = mapCacheReferences(original) - stableClasspaths.each { File generated, File stable -> - synced = synced - .replace(generated.absolutePath, stable.absolutePath) - .replace(generated.absolutePath.replace('\\', '/'), stable.absolutePath.replace('\\', '/')) +tasks.register('validateMavenReleaseCredentials') { + group = 'publishing' + description = 'Prevents Maven publication from silently targeting a local or incomplete repository.' + doLast { + if (!System.getenv('MAVEN_UPLOAD_URL') + || !System.getenv('MAVEN_UPLOAD_USERNAME') + || !System.getenv('MAVEN_UPLOAD_PASSWORD')) { + throw new GradleException('MAVEN_UPLOAD_URL, MAVEN_UPLOAD_USERNAME, and MAVEN_UPLOAD_PASSWORD are required') + } + if (System.getenv('MAVEN_UPLOAD_URL').startsWith('file:')) { + throw new GradleException('Maven release publication must use a remote repository') + } + } +} + +tasks.withType(PublishToMavenRepository).configureEach { + dependsOn tasks.named('validateMavenReleaseCredentials') + dependsOn tasks.named('verifyMavenCoordinates') + dependsOn(preparedReleaseDir == null + ? tasks.named('verifyReleaseArtifacts') + : tasks.named('verifyPreparedReleaseArtifacts')) +} + +tasks.register('syncForge40EclipseLaunches') { + group = 'ide' + dependsOn tasks.named('processResources') + doLast { + String mainClass = 'net.minecraftforge.userdev.LaunchTesting' + String mainOutput = new File(projectDir, 'bin/main').absolutePath + String modClasses = "mineralogy%%${mainOutput}" + String eclipseGradleJavaHome = System.getenv('JAVA_HOME') ?: System.getProperty('java.home') + def escapePreference = { String value -> + value.replace('\\', '\\\\').replace(':', '\\:') + } + File buildshipPreferences = file('.settings/org.eclipse.buildship.core.prefs') + if (!buildshipPreferences.parentFile.isDirectory() + && !buildshipPreferences.parentFile.mkdirs()) { + throw new GradleException("Could not create ${buildshipPreferences.parentFile}") + } + buildshipPreferences.setText([ + 'arguments=', + 'auto.sync=false', + 'build.scans.enabled=false', + 'connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)', + "connection.gradle.user.home=${escapePreference(gradle.gradleUserHomeDir.absolutePath)}", + 'connection.project.dir=', + 'eclipse.preferences.version=1', + "gradle.user.home=${escapePreference(gradle.gradleUserHomeDir.absolutePath)}", + "java.home=${escapePreference(eclipseGradleJavaHome)}", + 'jvm.arguments=', + 'offline.mode=false', + 'override.workspace.settings=true', + 'show.console.view=false', + 'show.executions.view=false', + '' + ].join('\r\n'), 'UTF-8') + // Forge 40 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. + // Eclipse rewrites sourceSets.main.output.resourcesDir to bin/main. + // Always copy from Gradle's actual processResources destination or the + // comparison degenerates into bin/main -> bin/main and leaves raw + // ${...} tokens from Eclipse's resource builder in production runs. + File processedResources = layout.buildDirectory.dir('resources/main').get().asFile + copy { + from processedResources + into mainOutput + } + ['Client', 'Server'].each { String runName -> + File launch = file("run${runName}.launch") + if (!launch.isFile()) throw new GradleException("Missing generated Eclipse launch ${launch}") + String text = launch.getText('UTF-8') + if (text.contains('')) { + String entries = + " \r\n" + text = text.replace( + '', + '\r\n' + + entries + '') + } + text = text.replace('', + "") + text = text.replaceFirst( + //, + java.util.regex.Matcher.quoteReplacement( + "")) + text = text.replaceFirst(//, + java.util.regex.Matcher.quoteReplacement("")) + // Slime Launcher tokenizes these program arguments itself. Paths + // containing spaces therefore have to be quoted in the launch + // file even though Eclipse already treats the whole XML value as + // one attribute. ForgeGradle's generated launch omits the quotes. + def programArguments = text =~ /()/ + if (programArguments.count != 1) { + throw new GradleException("ForgeGradle generated malformed program arguments in ${launch.name}") + } + String arguments = programArguments[0][2] + ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> + String prefix = "--${flag} " + int valueStart = arguments.indexOf(prefix) + if (valueStart < 0) { + throw new GradleException("ForgeGradle omitted --${flag} from ${launch.name}") } - synced = synced.replaceFirst( - //) { - "" + valueStart += prefix.length() + int valueEnd = arguments.indexOf(' --', valueStart) + if (valueEnd < 0) { + throw new GradleException("ForgeGradle generated an unterminated --${flag} path in ${launch.name}") } - if (original != synced) { - launchFile.setText(synced, 'UTF-8') - changedLaunches++ + String value = arguments.substring(valueStart, valueEnd) + if (!value.startsWith('"') || !value.endsWith('"')) { + arguments = "${arguments.substring(0, valueStart)}"${value}"${arguments.substring(valueEnd)}" } } + text = text.replace(programArguments[0][0], + programArguments[0][1] + arguments + programArguments[0][3]) + // Eclipse tokenizes VM arguments too. Quote the complete system + // property because this workspace path contains "MinecraftMineralogy 118". + 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 (!text.contains('ATTR_EXCLUDE_TEST_CODE')) { + text = text.replace('', + ' \r\n' + + '') + } + launch.setText(text, 'UTF-8') } + } +} - // ForgeGradle's launch group lets Java start even if its Buildship - // preparation step changed caches or failed. Publish the synchronized - // Java launch directly; Eclipse already copies resources into bin/main. - int changedLaunchGroups = 0 - fileTree(projectDir) { - include 'run*.launch' - }.files.each { File launchFile -> - String runName = launchFile.name.substring(0, launchFile.name.length() - '.launch'.length()) - File slimLaunch = new File(eclipseLaunchDir, "${project.name} - ${runName}Slim.launch") - if (!slimLaunch.isFile()) { - return +tasks.register('verifyEclipseProductionClasspath') { + group = 'verification' + dependsOn tasks.named('syncForge40EclipseLaunches') + doLast { + File classpath = file('.classpath') + if (!classpath.isFile()) throw new GradleException('Eclipse .classpath was not generated') + File eclipseProject = file('.project') + if (!eclipseProject.isFile() + || !eclipseProject.getText('UTF-8').contains("${eclipseWorkspaceProjectName}")) { + throw new GradleException("Eclipse project is not named ${eclipseWorkspaceProjectName}") + } + File buildshipPreferences = file('.settings/org.eclipse.buildship.core.prefs') + String expectedJavaHome = (System.getenv('JAVA_HOME') ?: System.getProperty('java.home')) + .replace('\\', '\\\\').replace(':', '\\:') + if (!buildshipPreferences.isFile() + || !buildshipPreferences.getText('UTF-8').contains("java.home=${expectedJavaHome}") + || !buildshipPreferences.getText('UTF-8').contains('override.workspace.settings=true')) { + throw new GradleException('Eclipse Buildship is not bound to the Gradle-compatible Java runtime') + } + String cp = classpath.getText('UTF-8') + def classpathXml = new XmlSlurper(false, false).parse(classpath) + classpathXml.classpathentry.each { entry -> + String path = entry.@path.text() + boolean testSource = path.replace('\\', '/').startsWith('src/test/') + boolean testLibrary = path ==~ /(?i).*\/(junit|hamcrest|mockito|byte-buddy)[^\/]*\/.*\.jar/ + if (testSource) { + String scope = entry.attributes.attribute.find { it.@name.text() == 'gradle_scope' }?.@value?.text() + if (entry.@output.text() != 'bin/test' || scope != 'test') { + throw new GradleException("Eclipse test source is not isolated: ${path}") + } + } + if (testLibrary) { + String scope = entry.attributes.attribute.find { it.@name.text() == 'gradle_used_by_scope' }?.@value?.text() + if (scope != 'test') { + throw new GradleException("Eclipse production classpath exposes test dependency: ${path}") + } + } + } + ['runClient.launch', 'runServer.launch'].each { name -> + String launch = file(name).getText('UTF-8') + if (!launch.contains('ATTR_EXCLUDE_TEST_CODE') || launch =~ /(?i)(junit|mockito|src\/test)/) { + throw new GradleException("Eclipse launch is not production-only: ${name}") + } + if (!launch.contains("key=\"org.eclipse.jdt.launching.PROJECT_ATTR\" value=\"${eclipseWorkspaceProjectName}\"")) { + throw new GradleException("Eclipse launch targets the wrong workspace project: ${name}") + } + 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 40'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}") + } } - String replacement = slimLaunch.getText('UTF-8') - if (launchFile.getText('UTF-8') != replacement) { - launchFile.setText(replacement, 'UTF-8') - changedLaunchGroups++ + if (!launch.contains('"-DlegacyClassPath.file=') + || !launch.contains('minecraft_classpath.txt" -DignoreList=')) { + throw new GradleException("Eclipse launch does not quote -DlegacyClassPath.file: ${name}") } } - logger.lifecycle("Eclipse runtime paths aligned with ${eclipseCache} (${stableClasspaths.size()} Forge classpaths, ${changedProjectClasspath} project classpath, ${changedResourceExclusions} metadata exclusion, ${changedPrepareLaunches} prepare launches, ${changedLaunches} slim launches, ${changedLaunchGroups} direct project launches updated)") + ['README.md', 'PLAYER_GUIDE.md', 'DEVELOPER_GUIDE.md', 'CONTENT_CONFIG.md', + 'PROVIDER.md', 'VERSIONS.md', 'examples/mineralogy-provider.json'].each { name -> + File guide = new File(projectDir, "bin/main/META-INF/mineralogy/docs/${name}") + if (!guide.isFile()) { + throw new GradleException("Eclipse output is missing bundled documentation: ${name}") + } + } + File processedResources = layout.buildDirectory.dir('resources/main').get().asFile + File processedProvider = new File(processedResources, + 'data/mineralogy/orespawn/provider.json') + File eclipseProvider = new File(projectDir, + 'bin/main/data/mineralogy/orespawn/provider.json') + if (!eclipseProvider.isFile() + || !java.util.Arrays.equals(eclipseProvider.getBytes(), processedProvider.getBytes())) { + throw new GradleException('Eclipse output contains stale processed production resources') + } + File processedModsToml = new File(processedResources, 'META-INF/mods.toml') + File eclipseModsToml = new File(projectDir, 'bin/main/META-INF/mods.toml') + if (!processedModsToml.isFile() || !eclipseModsToml.isFile() + || !java.util.Arrays.equals(eclipseModsToml.getBytes(), processedModsToml.getBytes())) { + 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.0.118021"')) { + throw new GradleException('Eclipse output contains unresolved or invalid Mineralogy version metadata') + } } } -tasks.configureEach { - if (name in ['copyEclipseResources', 'genEclipseRuns', 'eclipse', - 'prepareRunClient', 'prepareRunServer', 'prepareRunData', 'prepareRunGameTestServer']) { - finalizedBy syncEclipseRunClasspaths - } +tasks.matching { it.name == 'genEclipseRuns' }.configureEach { + finalizedBy tasks.named('syncForge40EclipseLaunches') +} + +tasks.register('isolateEclipseProductionRuns') { + group = 'ide' + dependsOn tasks.named('genEclipseRuns') + dependsOn tasks.named('syncForge40EclipseLaunches') +} + +tasks.matching { it.name == 'eclipse' }.configureEach { + finalizedBy tasks.named('syncForge40EclipseLaunches') +} + +tasks.named('check') { + dependsOn tasks.named('verifyReleaseDependencies') + dependsOn tasks.named('verifyMavenCoordinates') } diff --git a/ci-fixtures/tools/LICENSE-MAVENIZER.txt b/ci-fixtures/tools/LICENSE-MAVENIZER.txt new file mode 100644 index 000000000..8000a6faa --- /dev/null +++ b/ci-fixtures/tools/LICENSE-MAVENIZER.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/ci-fixtures/tools/README.md b/ci-fixtures/tools/README.md new file mode 100644 index 000000000..766eb6c68 --- /dev/null +++ b/ci-fixtures/tools/README.md @@ -0,0 +1,23 @@ +# Forge 1.18.2 Mavenizer compatibility fixture + +`minecraft-mavenizer-0.5.21-orespawn-1.18.jar` is a build-only derivative of +MinecraftForge MinecraftMavenizer `0.5.21`, source commit +`6968241ce7a0a902cdc1c534b976e8373a423091`. + +Forge 40's 1.18.2 decompiler emits a redundant explicit `Holder.Direct#value` +record accessor. The complete patched Minecraft source tree is rejected by +modern `javac`; removing that method is safe because the record generates the +same public accessor automatically. The derivative also honors +`ORESPAWN_MAVENIZER_OFFLINE=true` by adding Mavenizer's native `--offline` +argument. This closes ForgeGradle 7's failure to propagate Gradle offline mode +to the subprocess; it does not alter normal online builds. + +`minecraft-1.18-holder-accessor.patch` documents the complete two-file source +change. + +The fixture is used only while ForgeGradle prepares the development dependency. +It is checksum-verified by the build and excluded from every Mineralogy artifact. +MinecraftMavenizer remains licensed LGPL-2.1-only; see `LICENSE-MAVENIZER.txt`. + +SHA-256: +`28A6697BDF6D9500EC0AF9C1C949B9F3ED7DDFDA649CB5CAC4BEEA2E9567570A` diff --git a/ci-fixtures/tools/minecraft-1.18-holder-accessor.patch b/ci-fixtures/tools/minecraft-1.18-holder-accessor.patch new file mode 100644 index 000000000..57fd2b27d --- /dev/null +++ b/ci-fixtures/tools/minecraft-1.18-holder-accessor.patch @@ -0,0 +1,43 @@ +diff --git a/src/main/java/net/minecraftforge/mcmaven/cli/Main.java b/src/main/java/net/minecraftforge/mcmaven/cli/Main.java +index eeda8a0..4762951 100644 +--- a/src/main/java/net/minecraftforge/mcmaven/cli/Main.java ++++ b/src/main/java/net/minecraftforge/mcmaven/cli/Main.java +@@ -14,0 +15 @@ import java.util.ArrayList; ++import java.util.Arrays; +@@ -39,0 +41,6 @@ public class Main { ++ if ("true".equalsIgnoreCase(System.getenv("ORESPAWN_MAVENIZER_OFFLINE")) ++ && Arrays.stream(args).noneMatch("--offline"::equals)) { ++ var offlineArgs = Arrays.copyOf(args, args.length + 1); ++ offlineArgs[args.length] = "--offline"; ++ args = offlineArgs; ++ } +diff --git a/src/main/java/net/minecraftforge/mcmaven/impl/util/ProcessUtils.java b/src/main/java/net/minecraftforge/mcmaven/impl/util/ProcessUtils.java +index 9fa2888..be7f6be 100644 +--- a/src/main/java/net/minecraftforge/mcmaven/impl/util/ProcessUtils.java ++++ b/src/main/java/net/minecraftforge/mcmaven/impl/util/ProcessUtils.java +@@ -307,0 +308,2 @@ public final class ProcessUtils { ++ patchMinecraft118HolderAccessor(sourcesOutput); ++ +@@ -368,0 +371,22 @@ public final class ProcessUtils { ++ private static void patchMinecraft118HolderAccessor(File sourcesOutput) { ++ var holder = new File(sourcesOutput, "net/minecraft/core/Holder.java"); ++ if (!holder.isFile()) ++ return; ++ ++ try { ++ var source = Files.readString(holder.toPath()); ++ var record = "public static record Direct(T value) implements Holder"; ++ var accessor = "\n public T value() {\n return this.value;\n }\n"; ++ if (!source.contains(record) || !source.contains(accessor)) ++ return; ++ ++ var patched = source.replace(accessor, "\n"); ++ if (patched.contains(accessor)) ++ throw new IllegalStateException("Holder.Direct accessor compatibility patch was ambiguous"); ++ Files.writeString(holder.toPath(), patched); ++ LOGGER.info("Applied Minecraft 1.18.2 Holder.Direct javac compatibility patch"); ++ } catch (IOException e) { ++ throw new RuntimeException("Failed to patch Minecraft 1.18.2 Holder source", e); ++ } ++ } ++ diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-1.18.jar b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-1.18.jar new file mode 100644 index 000000000..f88af85f8 Binary files /dev/null and b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-1.18.jar differ diff --git a/docs/AGENTS.md b/docs/AGENTS.md deleted file mode 100644 index c53631a92..000000000 --- a/docs/AGENTS.md +++ /dev/null @@ -1,26 +0,0 @@ -# Mineralogy 6 Agent Guide - -Mineralogy is an OreSpawn 4 content provider and first customer. Read -`DEVELOPER_GUIDE.md` and `PROVIDER.md` before changing integrations. - -- Required engine: OreSpawn `[4.0.0,5.0.0)`. -- Provider resource: `data/mineralogy/orespawn/provider.json`, schema 3, - provider revision 3. -- Mineralogy owns block, fluid, and item registration; assets; recipes; loot; - mining and crafting tags; and old-world registry compatibility. -- OreSpawn owns terrain, geomes, formations, ores, fluid-deposit placement, profiles, - world-creation UI, retrogen, flat bedrock, and integration APIs. -- Do not restore old `zone.moddev.mc.mineralogy.api`, geology editor, or worldgen - packages. Make reusable engine changes in OreSpawn. -- Keep the provider declarative. No callbacks, registry access, logging, config - reads, or allocation belong in generation loops. -- Matching vanilla rocks remain preferred worldgen outputs through aliases. - Mineralogy equivalents stay registered for old saves and explicit pack use. -- Mineralogy contributes sulfur, phosphorous, and nitrate ore rules. OreSpawn - owns optional vanilla-ore presets; do not duplicate them here. -- Mineralogy owns and supplies the crude-oil fluid block and the - `mineralogy:fluid_deposit/crude_oil` provider rule. OreSpawn has no standalone - oil block or default fluid rule. - -The complete OreSpawn integration guide is packaged by OreSpawn and exported -to `config/orespawn-guide/` on first load. diff --git a/docs/CONTENT_CONFIG.md b/docs/CONTENT_CONFIG.md index fdb82e8cb..cbcf005eb 100644 --- a/docs/CONTENT_CONFIG.md +++ b/docs/CONTENT_CONFIG.md @@ -1,37 +1,108 @@ # Mineralogy Content Configuration -Mineralogy writes `config/mineralogy-common.toml`. These settings control -registered content, recipes, drops, and old-world handling. They do not control -terrain or ore placement; use OreSpawn for worldgen. +Mineralogy writes content options to `config/mineralogy-common.toml`. Changes require +a restart. OreSpawn owns terrain, rock, ore, and fluid-deposit placement; its +world settings are separate from these content and recipe switches. -Changes require a restart. Disabling a family may remove its recipes or -registration from the next launch, so do not disable content already present -in a world unless you understand the missing-registry consequences. +To add modded terrain blocks that Mineralogy rock may replace, do not add a +Mineralogy option. Configure OreSpawn's `terrain_dimensions` host list as +described under **Choosing Which Terrain Blocks Mineralogy Replaces** in the +[Player Guide](PLAYER_GUIDE.md). -## General Options +## General options | Key | Default | Purpose | | --- | --- | --- | -| `patch_world` | `true` | Allow compatibility patching for older Mineralogy worlds. | -| `SMELTABLE_GRAVEL` | `true` | Allow gravel to smelt into generic stone. | -| `DROP_COBBLESTONE` | `false` | Make ordinary rock blocks also drop cobblestone. | -| `COBBLESTONE_EQUIVILENT` | `true` | Treat rocks as cobblestone equivalents where supported. The historical misspelling is the real config key. | -| `GROUP_TABS_BY_TYPE` | `false` | Split creative inventory entries by item type where supported. | - -## Generated Content Flags - -All of these default to `true`: - -- `GENERATE_RELIEFS` -- `GENERATE_ROCKSTAIRS`, `GENERATE_ROCKFURNACE`, `GENERATE_ROCKSLAB`, - `GENERATE_ROCKWALL` -- `GENERATE_BRICK`, `GENERATE_BRICKFURNACE`, `GENERATE_BRICKSTAIRS`, - `GENERATE_BRICKSLAB`, `GENERATE_BRICKWALL` -- `GENERATE_SMOOTH`, `GENERATE_SMOOTHFURNACE`, `GENERATE_SMOOTHSTAIRS`, - `GENERATE_SMOOTHSLAB`, `GENERATE_SMOOTHWALL` -- `GENERATE_SMOOTHBRICK`, `GENERATE_SMOOTHBRICKFURNACE`, - `GENERATE_SMOOTHBRICKSTAIRS`, `GENERATE_SMOOTHBRICKSLAB`, - `GENERATE_SMOOTHBRICKWALL` - -The names use `GENERATE` for historical compatibility even though these flags -mostly control content registration and recipes, not chunk generation. +| `patch_world` | `true` | Preserve compatibility placeholders for older Mineralogy worlds. | +| `SMELTABLE_GRAVEL` | `true` | Allow gravel to be smelted into generic stone. | +| `DROP_COBBLESTONE` | `false` | Make an ordinary raw rock drop one vanilla cobblestone instead of itself. | +| `COBBLESTONE_EQUIVILENT` | `true` | Treat raw rocks as cobblestone in compatible recipes. The misspelling is the real historical key. | +| `GROUP_TABS_BY_TYPE` | `false` | Split creative inventory entries into Rocks, Stairs, Slabs, Walls, and Items tabs. | + +`GROUP_TABS_BY_TYPE` changes only creative organization. It never changes +registration, recipes, drops, or world generation. With the default `false`, +Mineralogy retains its single searchable tab and existing vanilla-tab +placements such as mineral fertilizer under Materials. With `true`, reliefs, +furnaces, lamps, drywall, storage blocks, dusts, fertilizer, and the crude-oil +bucket use Mineralogy Items. + +## Compatibility-safe content switches + +These four keys default to `true`: + +| Key | What `false` does | +| --- | --- | +| `ENABLE_DRYWALLS` | Hides all 16 drywalls and omits their base and dye recipes. | +| `ENABLE_ROCK_SALT_LAMPS` | Hides both rock salt lights and omits their recipes. | +| `ENABLE_MINERAL_DUSTS` | Hides sulfur, phosphorous, and nitrate dusts plus their storage blocks; omits storage conversions and Mineralogy's gunpowder recipes. | +| `ENABLE_MINERAL_FERTILIZER` | Hides mineral fertilizer and omits its recipe. | + +These switches never unregister content. Existing blocks, inventory stacks, +drops, Forge tag entries, and integrations remain valid. The dust and +fertilizer switches are independent, so enabled fertilizer may use dusts from +existing ore, OreSpawn-generated ore, or another mod. + +Every Mineralogy gunpowder route requires three components: nitrate dust, +sulfur dust, and one of sugar, charcoal, `forge:dusts/carbon`, or +`forge:dusts/coal`. The two compatibility-tag recipes are loaded only when +another installed mod supplies the corresponding nonempty tag; an absent +optional dust never reduces the recipe to nitrate plus sulfur. + +A clean installation writes these keys. Mineralogy deliberately does not save +an existing `mineralogy-common.toml`, so missing keys retain their documented defaults. +To change them in an older file, add entries to its existing `options` block: + +```toml +[options] +COBBLESTONE_EQUIVILENT = false +ENABLE_DRYWALLS = false +ENABLE_MINERAL_DUSTS = false +ENABLE_MINERAL_FERTILIZER = false +ENABLE_ROCK_SALT_LAMPS = false +GROUP_TABS_BY_TYPE = true +``` + +## Rock recipe compatibility + +With `COBBLESTONE_EQUIVILENT=true`, all 27 raw Mineralogy rock families, +including rock salt, participate in Forge `cobblestone` tag recipes such +as levers, pistons, dispensers, droppers, and brewing stands. Setting it to +`false` removes ordinary rocks from the sixteen covered cobblestone, stone-tool, +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 and therefore keep those recipe roles. + +The configurable cobblestone identity does not affect the exact 1:1 conversion +between Mineralogy and vanilla andesite, diorite, granite, and matching polished +slabs. These reversible recipes preserve modpack compatibility with recipes that +require either registry identity. + +## Disabling Mineralogy ores + +Mineralogy does not provide a second ore-generation switch. In OreSpawn's +world settings, open **Rocks & Ores...**, select **Ores**, and disable these +rules: + +- `mineralogy:ore/mineralogy/sulfur_ore` +- `mineralogy:ore/mineralogy/phosphorous_ore` +- `mineralogy:ore/mineralogy/nitrate_ore` + +Disabling a rule affects newly generated chunks; it does not remove existing +ore. If mineral dust recipes are disabled but these rules remain enabled, the +new ore retains its historical dust drops. + +## Historical generated-content flags + +The following historical keys default to `true`: `GENERATE_RELIEFS`, +`GENERATE_ROCKSTAIRS`, `GENERATE_ROCKSLAB`, `GENERATE_ROCKWALL`, +`GENERATE_ROCKFURNACE`, `GENERATE_BRICK`, `GENERATE_BRICKSTAIRS`, +`GENERATE_BRICKSLAB`, `GENERATE_BRICKWALL`, `GENERATE_BRICKFURNACE`, +`GENERATE_SMOOTH`, `GENERATE_SMOOTHSTAIRS`, `GENERATE_SMOOTHSLAB`, +`GENERATE_SMOOTHWALL`, `GENERATE_SMOOTHFURNACE`, `GENERATE_SMOOTHBRICK`, +`GENERATE_SMOOTHBRICKSTAIRS`, `GENERATE_SMOOTHBRICKSLAB`, +`GENERATE_SMOOTHBRICKWALL`, and `GENERATE_SMOOTHBRICKFURNACE`. + +Despite their names, these control construction-content registration and +recipes rather than chunk generation. Disabling them can make existing content +unavailable on the next start; back up a world before changing them. diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index 7bb0497cf..4e6cfa00a 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -4,70 +4,157 @@ | Mineralogy owns | OreSpawn owns | | --- | --- | -| Blocks, items, fluids, block entities | Terrain replacement and formations | -| Models, textures, language, recipes, loot | Geomes and biome influences | -| Mining, family, and crafting tags | Ore and fluid-deposit placement | -| Registry aliases and old-save compatibility | Profiles, UI, retrogen, templates | -| Mineralogy's provider declaration | Public worldgen API and provider loader | +| Blocks, items, fluids, and tile entities | Terrain replacement and formations | +| Models, textures, language, recipes, and drops | Geomes and biome influences | +| Forge tag identities and old-save compatibility | Ore and fluid-deposit placement | +| Mineralogy's provider declaration and migration | Profiles, UI, retrogen, and templates | -Mineralogy has a mandatory runtime dependency on OreSpawn `[4.0.0,5.0.0)`. -Do not build integrations against Mineralogy internals. Use -`zone.moddev.mc.orespawn.api` or an OreSpawn provider file. +Mineralogy requires OreSpawn `[4.0.6,5.0.0)`. Reusable worldgen integrations +belong in `zone.moddev.mc.orespawn.api` or an OreSpawn provider rather than +Mineralogy internals. ## Packaged Provider -`src/main/resources/data/mineralogy/orespawn/provider.json` is schema 3, -provider revision 3. It currently declares 32 rock rules and three ore rules: -sulfur, phosphorous, and nitrate. Profile defaults add stable Sky formations, -Overworld stone/deepslate hosts, matching-vanilla aliases, and Mineralogy crude -oil as the provider-owned `mineralogy:fluid_deposit/crude_oil` rule. +The schema-4, revision-3 provider is at: -OreSpawn owns the optional vanilla ore presets. They must not be duplicated in -Mineralogy's declaration. - -When changing the declaration: - -1. Keep provider-owned IDs stable. -2. Increase `provider_revision` when adding provider IDs or defaults that - existing worlds should discover. -3. Preserve user-edited world profiles; OreSpawn merges only new provider IDs. -4. Run the provider test and an integrated worldgen smoke. - -Pack authors may place an authoritative override at -`config/mineralogy-orespawn.json`. If that present file is malformed, OreSpawn -rejects the provider rather than silently using the bundled declaration. - -## Useful Tags - -- `mineralogy:rocks` and `mineralogy:standard_rocks` exist as block and item - tags. -- `mineralogy:rocks/sedimentary`, `mineralogy:rocks/metamorphic`, and - `mineralogy:rocks/igneous` expose the broad taxonomy. -- `mineralogy:crafting_materials/` item tags back matching recipes. +```text +src/main/resources/data/mineralogy/orespawn/provider.json +``` -Use Forge and vanilla stone/cobblestone tags when broad compatibility is -intended. Keep rock-specific recipes narrow enough to return the matching -Mineralogy decorative block or furnace. +It declares 32 rock rules, sulfur, phosphorous, and nitrate ores, and the +provider-owned `mineralogy:fluid_deposit/crude_oil` rule. OreSpawn owns optional +vanilla-ore management and must not be duplicated in Mineralogy. + +Keep provider-owned IDs stable. Existing worlds contain self-contained +profiles; provider updates must not overwrite established world choices. A pack +may supply an authoritative full override at +`config/mineralogy-orespawn.json`. + +## Forge Tag Integration + +All raw rocks use `forge:stone` and their material-specific Mineralogy tags. +When the historical `COBBLESTONE_EQUIVILENT` option is enabled, all 27 raw +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.18'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 40 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, +then invalidates recipe ingredient caches. The nested Minecraft crafting and +tool tags are updated alongside the direct Forge tag. + +Sixteen 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 40'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.18 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 +sand. That leaves 2x2 matching raw blocks available for Mineralogy bricks. The +matching vanilla advancements are overridden too, so native polishing is +revealed only after the player has both the exact native rock and sand. + +Native `minecraft:tuff` is the raw tuff-family input; Mineralogy supplies all +of its construction and polished forms. `minecraft:smooth_basalt` joins the +smooth-basalt family and can unlock and craft Mineralogy smooth-basalt forms, +while Minecraft's basalt-to-smooth-basalt smelting recipe remains intact. +Deepslate is deliberately only an OreSpawn terrain and ore host, not a +Mineralogy construction family. + +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.18.2, 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. + +The six shared raw/polished slab crafting recipes and nine corresponding +stonecutting routes deliberately output Mineralogy's upright-capable slabs. +Twelve exact shapeless recipes provide reversible 1:1 conversion between those +Mineralogy slabs and their retained vanilla counterparts. This preserves exact +item compatibility for other mods without allowing a normal crafting or +stonecutting route to prefer the less capable slab. + +Use broad `stone` or `cobblestone` inputs only when any matching material is +valid. Recipes returning a Mineralogy construction form must use the exact +material and finish so basalt cannot produce a different rock's slab or wall. + +## Crafting Data + +All Mineralogy recipes are native Minecraft/Forge 1.18.2 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 +target-native polished-block recipe/advancement overrides, then retains the +target-native smelting data. Every Mineralogy recipe has a matching unlock +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.18.2'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 +deliberately do not require an already-owned vanilla furnace, so the upgrade +route is visible before that intermediate is crafted. + +Reliefs preserve the historical two-stage contract. Nine matching polished +blocks produce 16 blank reliefs; a target-native synonym may satisfy the exact +rock-family tag. The blank relief is then the exact input to the marked relief +recipes. Two matching left reliefs shapelessly produce two right reliefs. Do +not substitute unrelated materials or broad stone tags for these inputs. +Do not reintroduce a parallel Java crafting registry. ## Backward Compatibility -Mineralogy's andesite, basalt, diorite, granite, and tuff remain registered even -though new terrain aliases them to Minecraft's blocks. Registry remaps and the -legacy world-data hook must stay available for old saves. Changing a registry -ID requires a deliberate migration, not just a renamed Java field. +Keep the `mineralogy` mod ID, every registry name, tile ID, NBT field, asset +path, recipe identity, patch alias, Forge tag identity, and provider rule +stable. Production Java packages use `zone.moddev.mc.mineralogy`; implementation +package names are not saved-world identities. + +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 40 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 +legacy rock-furnace tile IDs, retains sidecar recovery, and protects populated +chunks from cross-boundary feature writes. Its packaged runtime uses SRG method +names, so transformer matching relies on stable owners and descriptors and +fails startup if an insertion point cannot be found. Validate both previously +unloaded occupied furnaces and new chunks at an old-world boundary in the +reobfuscated jar; a development launch alone cannot prove this path. ## Building -Use Java 17 and run: +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: ```powershell -.\gradlew.bat test build javadoc --no-daemon -.\gradlew.bat genEclipseRuns eclipse --no-daemon +$env:JAVA_HOME='path-to-a-Java-17-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 +.\gradlew.bat assemble --no-daemon ``` -The normal jar packages these guides at `META-INF/mineralogy/docs/` and places -the short public agent guide at its root. Private workspace agent notes are -ignored and must not be committed. +Inspect complete client/server logs and test the reobfuscated jar with released +OreSpawn in a launcher-like Forge installation. The normal jar packages this +guide under `META-INF/mineralogy/docs/`. -For all provider fields, templates, custom dimensions, Java API calls, and -performance rules, use the OreSpawn guide in `config/orespawn-guide/`. +The complete release version is `Major.Minor.Bug.Target`; see +[Mineralogy Versioning](VERSIONS.md). This branch validates target `118021` +for Minecraft 1.18.2 Forge and does not append CI build numbers. diff --git a/docs/PLAYER_GUIDE.md b/docs/PLAYER_GUIDE.md index 5ed3736de..ca3630550 100644 --- a/docs/PLAYER_GUIDE.md +++ b/docs/PLAYER_GUIDE.md @@ -1,49 +1,219 @@ -# Player Guide +# Mineralogy Player Guide ## Installing -Mineralogy 6 needs both the Mineralogy and OreSpawn 4 jars for Minecraft -1.18.2. Install both on clients and servers. A world that contains Mineralogy -blocks should not be opened without Mineralogy. +Mineralogy 6 needs Minecraft 1.18.2, Forge 40.3.0, and OreSpawn +4.0.10.118021. +Install matching Mineralogy and OreSpawn jars on both clients and servers. Do +not open a world containing Mineralogy blocks without Mineralogy installed. -## Creating A World +## Creating Or Upgrading A World -Open **OreSpawn World Generation** from the world-creation screen. Recommended -Defaults is a good starting point. The in-game **Help & Guide** explains Sky -geology, classic Cyano layers, formation sizes, ores, fluid deposits, geomes, -and biomes. +Open **OreSpawn World Generation** while creating a world. **Recommended +Defaults** selects Mineralogy's Sky/geome Stable Layers profile. Use **Help & +Guide** for OreSpawn's explanation of geology, formations, geomes, ores, and +fluid deposits. Worldgen changes affect newly explored chunks only. -Mineralogy supplies the rock and deposit choices; OreSpawn performs the actual -generation. Changes apply to newly explored chunks only. +OreSpawn detects worlds created by Mineralogy 3 and keeps them on the +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.18.2 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 +also normalized so a legacy chest or furnace cannot prevent its whole chunk +from loading. Let the game or server stop normally after the upgrade so +converted chunks can be saved. A complete copied world test is strongly +recommended before upgrading the original. ## What Mineralogy Adds - Sedimentary, metamorphic, intrusive igneous, and volcanic igneous rocks. -- Rock-specific slabs, stairs, walls, bricks, polished blocks, reliefs, and - furnaces when their content options are enabled. -- Sulfur, phosphorous, and nitrate ores. -- Rock salt lamps and streetlamps. -- Crude oil blocks and buckets. OreSpawn decides where deposits form. +- Matching slabs, stairs, walls, bricks, polished blocks, reliefs, and + furnaces when their historical content flags are enabled. +- Sulfur, phosphorous, and nitrate ores and dusts. +- Drywall, mineral fertilizer, rock salt lamps, and street lamps. +- Distinct `mineralogy:crude_oil` and `mineralogy:flowing_crude_oil` fluids, + plus a block and bucket. OreSpawn decides + where covered Ocean deposits form. + +Raw Mineralogy rocks work in broad stone recipes. With +`COBBLESTONE_EQUIVILENT=true`, they also join Forge's block and item +`cobblestone` tags for recipes such as levers, pistons, dispensers, and brewing stands. +Exact Mineralogy rocks still make their matching Mineralogy slabs, stairs, and +walls. -Most ordinary rocks work in stone and cobblestone recipes. A furnace made from -one matching rock produces that rock's Mineralogy furnace where a matching -family exists. +Minecraft also has its own andesite, diorite, granite, polished-andesite, +polished-diorite, and polished-granite slabs. Normal crafting and stonecutting +produce Mineralogy's upright-capable versions. If another mod requires the +exact Minecraft slab item, place one matching Mineralogy slab by itself in a +crafting grid to convert it 1:1; placing the vanilla slab by itself converts it +back without loss. -## Vanilla-Named Rocks +Minecraft's native basalt and tuff work as members of their matching Mineralogy +families. Native smooth basalt also works wherever Mineralogy expects smooth +basalt, while Minecraft's normal basalt-smelting recipe is left unchanged. +Deepslate is used as terrain and an ore host, but is not a Mineralogy +construction family. -Minecraft now has andesite, basalt, diorite, granite, and tuff. Mineralogy uses -those vanilla blocks in new layers by default. Its historical blocks remain -registered so old saves load correctly and can be selected again in a pack. +Because raw rocks are cobblestone equivalents, eight raw Mineralogy rocks +around an empty crafting-grid centre make a normal Minecraft furnace. A +Mineralogy rock furnace is an upgrade recipe: surround an existing Minecraft +furnace with eight matching Mineralogy slabs. Brick, polished, and +polished-brick furnaces use the corresponding slab finish. ## Configuration And Servers -`mineralogy-common.toml` controls content and recipes. OreSpawn's worldgen -screen and JSON profile control generation. +`config/mineralogy-common.toml` controls Mineralogy content and recipe compatibility. +OreSpawn's UI and JSON profile control terrain and deposits. Settings require a +restart. + +### Choosing Where Each Rock Is Most Common + +While creating a world, open **OreSpawn World Generation**, choose **Rocks & +Ores...**, select the appropriate rock-family tab, and then select the rock. +Its **Rock Settings** screen provides four altitude controls: + +- **Preferred Y** (`depth_peak`) is the level where that rock has its strongest + depth preference. It is a preference, not a hard placement level. +- **Depth Spread** (`depth_spread`) controls how gradually that preference + falls away above and below Preferred Y. A larger value makes the rock common + across a broader vertical range. +- **Minimum Y** (`min_y`) and **Maximum Y** (`max_y`) are inclusive hard limits. + The rock cannot replace terrain outside them. + +Minecraft 1.18.2 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. + +For defaults inherited by newly created worlds, the same fields can be edited +in `config/orespawn-worldgen.json`. For an established world, stop the game or +server and edit its authoritative +`/serverconfig/orespawn-worldgen.json` instead. Restart after changing +the profile. Changes affect only chunks generated afterward; OreSpawn does not +retro-generate different rock strata into existing chunks. + +### Upgrading a Mineralogy 6.0 World + +On the first 6.1 start, existing Mineralogy 6.0 JSON geology settings are +copied into OreSpawn before its provider is loaded. Both the instance defaults +and the established world's own profile are retained, while old block-named +rock and ore rules are renamed to Mineralogy's stable provider IDs to avoid +double ore generation. Mineralogy never edits the old files and never replaces +an existing OreSpawn global or world profile. Keep the generated migration +reports until the upgraded world has been checked and reloaded successfully. + +### Choosing Which Terrain Blocks Mineralogy Replaces + +Mineralogy does not maintain a separate replacement blocklist. OreSpawn owns +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.18.2 graphical editor. Stop +Minecraft or the server before editing the JSON. For defaults inherited by +worlds created afterward, edit: + +```text +config/orespawn-worldgen.json +``` + +For a world that already exists, edit its authoritative saved profile instead: + +```text +/serverconfig/orespawn-worldgen.json +``` + +Find `terrain_dimensions`, retain `minecraft:stone`, and add the registry ID of +each natural terrain block that Mineralogy rock may replace: + +```json +"terrain_dimensions": { + "minecraft:overworld": { + "enabled": true, + "biome_ids": [], + "biome_namespaces": [], + "host_blocks": [ + "minecraft:stone", + "minecraft:deepslate", + "examplemod:custom_stone" + ], + "host_tags": [] + } +} +``` + +Use `host_tags` when an OreSpawn/pack-provided group is more appropriate; on +Minecraft 1.18.2 these resolve through target-native block tags. Exact +`host_blocks` entries are the clearest choice for one +modded stone. + +Minecraft 1.18.2 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; +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.18.2 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.18.2 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. + +First, add an enabled entry inside `terrain_dimensions`. This example allows +Mineralogy to replace vanilla stone throughout a custom moon dimension: + +```json +"examplemod:moon": { + "enabled": true, + "biome_ids": [], + "biome_namespaces": [], + "host_blocks": ["minecraft:stone"], + "host_tags": [] +} +``` + +Use the dimension's actual base-stone registry ID instead when it does not use +vanilla stone. Optional `biome_ids` or `biome_namespaces` can limit replacement +within the dimension. + +Second, add the dimension to every desired entry under `rocks`: + +```json +"dimensions": ["minecraft:overworld", "examplemod:moon"] +``` + +Keep `minecraft:overworld` in the list when that rule should continue to work +there. A rock entry with no `dimensions` field is Overworld-only, and OreSpawn +disables a custom terrain dimension if none of the configured rocks include it. +Different dimensions can therefore use different rock sets by assigning +different membership lists. + +For advanced packs, the same output block may have separate rules with unique +rule IDs, different altitude fields, and non-overlapping `dimensions` lists. +This allows, for example, basalt to use different Preferred Y or hard height +bounds in the Overworld and a planet dimension. Do not make both rules eligible +in the same dimension, because duplicate output states are rejected while that +dimension is baked. + +Restart after editing and inspect the OreSpawn startup log to confirm that the +custom dimension baked with eligible rocks and resolved host blocks. Only new +chunks receive the geology; existing terrain is not retro-generated. + +Each world stores its complete worldgen profile at: -Every world stores a complete profile at -`/serverconfig/orespawn-worldgen.json`. Copy the world, including that -file, to a dedicated server and install the same required mods. Blocks from -missing mods cannot be generated. +```text +/serverconfig/orespawn-worldgen.json +``` -For advanced pack setup, read `config/mineralogy-guide/` and -`config/orespawn-guide/` after the game has started once. +Copy the complete world, including that file, to a dedicated server and +install the same required mods. For advanced setup, read +`config/mineralogy-guide/` and `config/orespawn-guide/` after one start. diff --git a/docs/PROVIDER.md b/docs/PROVIDER.md index 66183dc52..7a773bf0c 100644 --- a/docs/PROVIDER.md +++ b/docs/PROVIDER.md @@ -1,46 +1,114 @@ # Mineralogy OreSpawn Provider -Mineralogy packages its provider at: +Mineralogy packages its OreSpawn declaration at: ```text data/mineralogy/orespawn/provider.json ``` -The file is also exported as -`config/mineralogy-guide/examples/mineralogy-provider.json` so pack authors can -inspect the exact declaration used by their build. +The exact bytes from the installed build are exported as +`config/mineralogy-guide/examples/mineralogy-provider.json`. ## Current Contents -- Schema version 3, provider mod ID `mineralogy`, provider revision 3. -- 32 enabled rock rules covering Mineralogy's geological families. +- 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. -- Overworld replacement hosts for Minecraft stone and deepslate. -- Stable-layer profile defaults and one provider-owned - `mineralogy:fluid_deposit/crude_oil` rule. -- Ocean-only sedimentary hosts, Y -48 to 48, covered lobe geometry, and a - minimum two-block solid cap for crude oil. -- Worldgen aliases from Mineralogy andesite, basalt, diorite, granite, and tuff - to their matching vanilla blocks. +- Minecraft 1.18.2 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 + worlds. Native smooth basalt is also accepted by the matching smooth family. +- Both `minecraft:stone` and `minecraft:deepslate` are terrain hosts. The three + ore rules use Minecraft's stone- and deepslate-ore-replaceable tags. +- Sky/geome Stable Layers defaults for fresh worlds plus Cyano defaults used + when OreSpawn migrates an established Mineralogy 3 world. +- The covered `mineralogy:fluid_deposit/crude_oil` rule at Y `-48` through `48`, + frequency `0.08`, Ocean biomes, and sedimentary hosts. -The old Mineralogy blocks remain registered; aliases change only the default -block state chosen for newly generated terrain. +Mineralogy contains no separate terrain or ore generator. OreSpawn compiles +and runs this declaration. ## Pack Override -To replace Mineralogy's bundled declaration for a pack, put a complete file at: +To replace the bundled declaration for a pack, provide one complete file at: ```text config/mineralogy-orespawn.json ``` -The external file is authoritative when present. Validate it against the -OreSpawn schema before shipping. A malformed or incomplete override makes the -Mineralogy provider inactive, allowing failures to be visible instead of -silently mixing two configurations. +The external file is authoritative when present. Validate it against +OreSpawn's provider schema before shipping; OreSpawn rejects a malformed +override instead of silently mixing it with packaged defaults. Mineralogy's +legacy ore migration never overwrites an existing override or established +`config/orespawn-worldgen.json`. -Existing worlds use their own self-contained OreSpawn profile. Provider updates -can add newly introduced IDs, but do not overwrite established world choices. +Existing worlds use their own profile at +`/serverconfig/orespawn-worldgen.json`. Provider updates do not replace +established world choices. See `config/orespawn-guide/` for the complete schema, +field, template, dimension, API, and performance references. -The authoritative provider field reference, JSON Schema, validated example, -ownership rules, lifecycle, and Java API are in `config/orespawn-guide/`. +When upgrading from Mineralogy 6.0, Mineralogy copies the old +`config/mineralogy-geomes.json` and per-world +`serverconfig/mineralogy-geology.json` settings into their OreSpawn equivalents +only when no OreSpawn file already exists. Old block-named Mineralogy entries +are mapped to the stable provider rule IDs so the same ore is not registered +twice. The source files are retained unchanged, migration reports are written +beside the new files, and a second start makes no further migration changes. + +## Rock Altitude Defaults + +Each entry in `rocks` may set a soft altitude preference with `depth_peak` and +`depth_spread`, then constrain it with the inclusive hard bounds `min_y` and +`max_y`. A larger spread keeps more of the rock's weight farther above and +below its peak. These fields combine with the rule's overall `weight`, family, +and per-geome weights; they do not guarantee that one rock occupies every block +at its preferred level. + +Pack authors can establish different defaults in a complete +`config/mineralogy-orespawn.json` provider override. Players can use +OreSpawn's **Rocks & Ores...** editor while creating a world. Once a world has +been created, its saved `orespawn-worldgen.json` profile is authoritative and +provider changes do not rewrite it. + +## Dimension Membership + +Issue #30's dimension configuration is supplied by OreSpawn. Add the target to +`terrain_dimensions` with its eligible `host_blocks` or `host_tags`, then add +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.18.2 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 +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.18.2 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. + +## Terrain Replacement Hosts + +Issue #57's replacement blocklist is provided by OreSpawn rather than +`mineralogy-common.toml`. The packaged profile enables +`terrain_dimensions.minecraft:overworld` with `minecraft:stone` and +`minecraft:deepslate` in `host_blocks`. Pack authors may add installed +natural-terrain registry IDs or appropriate host tags to that dimension. + +Use `config/orespawn-worldgen.json` for installed-pack defaults applied to new +worlds. Once a world exists, its +`/serverconfig/orespawn-worldgen.json` snapshot is authoritative and +must be edited directly while the game or server is stopped. A complete +`config/mineralogy-orespawn.json` override is appropriate only when a pack +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.18.2, 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 4e1224b4f..58484d5d5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,22 +1,23 @@ # Mineralogy Guide -Mineralogy 6 is a content provider for OreSpawn 4. This guide explains the -Mineralogy content, its small content configuration, and the declaration it -supplies to OreSpawn. +Mineralogy 6 for Minecraft 1.18.2 supplies rock, mineral, construction, and +crude-oil content to OreSpawn 4. OreSpawn is the only terrain and deposit +engine. - [Player Guide](PLAYER_GUIDE.md): installation, world creation, content, and server copying. -- [Content Configuration](CONTENT_CONFIG.md): every - `mineralogy-common.toml` option. -- [Developer Guide](DEVELOPER_GUIDE.md): ownership boundaries, tags, builds, - and compatibility rules. +- [Content Configuration](CONTENT_CONFIG.md): every Mineralogy content and + compatibility option. +- [Developer Guide](DEVELOPER_GUIDE.md): ownership boundaries, Forge tag + integration, builds, and compatibility rules. - [Provider Reference](PROVIDER.md): Mineralogy's packaged OreSpawn declaration and pack override. -- [AGENTS.md](AGENTS.md): short machine-readable orientation for coding agents. +- [Versioning](VERSIONS.md): how functional releases and exact Minecraft/loader + targets form Mineralogy's four-component version. -The actual provider is also exported as -`examples/mineralogy-provider.json` for inspection. +The exact provider shipped by this build is also exported as +`examples/mineralogy-provider.json`. -For general worldgen controls, JSON schemas, templates, dimensions, ore -patterns, performance constraints, or the Java API, use the OreSpawn guide -exported to `config/orespawn-guide/`. +For general worldgen controls, schemas, templates, dimensions, ore patterns, +performance constraints, or the Java API, use the OreSpawn guide exported to +`config/orespawn-guide/`. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md new file mode 100644 index 000000000..473a77a16 --- /dev/null +++ b/docs/VERSIONS.md @@ -0,0 +1,177 @@ +# Mineralogy Versioning + +Mineralogy releases use a four-component version so the feature set and the +exact Minecraft/loader target are both visible in one number. + +## Version format + +```text +Major.Minor.Bug.Target +``` + +The first three components are the **functional version**. Mineralogy `6.1.0` +means major generation 6, minor release 1, and bug revision 0. + +The fourth component identifies the target build. The complete version for +this Minecraft 1.18.2 Forge release is therefore: + +```text +6.1.0.118021 +``` + +This expanded numeric form is compatible with Maven version ordering, but it +is not strict Semantic Versioning 2.0 because SemVer defines three numeric core +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.0.118021`, not `1.18.2-6.1.0.118021`. The Target already makes tags unique +across Minecraft versions and loaders. + +## Reading the target component + +The target is deterministic; it is not a CI run number or another feature +revision. + +To calculate it: + +1. Write the Minecraft version as `major.minor.patch`, using zero when the + patch component is omitted. +2. Concatenate the Minecraft major number without padding, the minor number as + two digits, the patch number as two digits, and the one-digit loader code. +3. Use loader code `1` for Forge and `2` for NeoForge. + +It can be decoded from right to left: one loader digit, two patch digits, two +minor digits, and all remaining digits for the Minecraft major version. + +| Minecraft | Loader | Target | Example complete version | +| --- | --- | ---: | --- | +| 1.10.2 | Forge | `110021` | `6.0.1.110021` | +| 1.12.2 | Forge | `112021` | `6.0.1.112021` | +| 1.14.4 | Forge | `114041` | `6.0.1.114041` | +| 1.15.2 | Forge | `115021` | `6.0.1.115021` | +| 1.16.5 | Forge | `116051` | `6.1.0.116051` | +| 1.17.1 | Forge | `117011` | `6.1.0.117011` | +| 1.18.2 | Forge | `118021` | `6.1.0.118021` | +| 1.20.6 | Forge | `120061` | `6.0.0.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.18.2 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. + +Historical Mineralogy releases may also have four numeric components that used +the last number as an ordinary build sequence. The target policy applies to +new releases and does not reinterpret an old file's version. + +## Major version + +The **Major** number changes for a fundamental or breaking new generation of +Mineralogy. + +Mineralogy 6 is the clearest example: Mineralogy now provides rocks, ores, +fluids, recipes, and an OreSpawn provider, while OreSpawn exclusively owns +terrain, strata, ore placement, deposits, profiles, and their user interface. +That is a larger architectural change than an ordinary feature or fix. + +Compatibility adaptations needed for another Minecraft or loader version do +not by themselves require a major increase when players and integrations +receive the same supported behaviour. + +## Minor version + +The **Minor** number changes for a substantial feature or behavioural change +that does not justify a new major generation. Examples include a significant +new family of player-usable content or a major overhaul of an existing system. + +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.0.118021 -> 6.2.0.118021 +6.2.4.118021 -> 7.0.0.118021 +``` + +## Bug version + +The **Bug** number changes for a bug fix or very small feature. Examples +include fixing saved inventory loading, correcting a recipe or translation, +or making a small configuration or documentation improvement that warrants a +release. + +Other projects often call this the patch number. MMD uses **Bug** to describe +its purpose and **Target** for the Minecraft/loader qualifier. + +## Ports to other Minecraft versions + +A functionally equivalent port keeps the same `Major.Minor.Bug` version and +changes only its Target. For example, equivalent Mineralogy 6 releases could +be: + +```text +Minecraft 1.10.2 / Forge / Mineralogy 6.0.0.110021 +Minecraft 1.12.2 / Forge / Mineralogy 6.0.1.112021 +Minecraft 1.14.4 / Forge / Mineralogy 6.0.1.114041 +Minecraft 1.15.2 / Forge / Mineralogy 6.0.1.115021 +Minecraft 1.17.1 / Forge / Mineralogy 6.1.0.117011 +Minecraft 1.18.2 / Forge / Mineralogy 6.1.0.118021 +``` + +Minecraft and loader APIs may require different internal code without changing +the functional version. If a port also adds a player-visible feature or fix, +the Major, Minor, or Bug component must be assessed separately; the Target +still identifies the build's actual platform. + +## Branch-specific fixes and skipped numbers + +Functional versions are allocated across Mineralogy as a whole. One functional +number must not describe unrelated changes on different Minecraft branches. +The same number may be shared by branches only when the releases are intended +to provide the same functional change. + +If a fix applies only to one old branch, that branch may receive the next Bug +number while other branches remain unchanged. A later, unrelated fix on +another branch uses the next unused number even if that branch never needed +the earlier fix. Skipped Bug numbers are therefore valid. + +This means a higher version on another Minecraft branch does not necessarily +contain every lower-numbered platform-specific fix. Release notes remain the +authoritative description of included changes. + +## Dependencies and modpacks + +Dependency ranges normally describe compatible functional releases. For +example, `[6.0.0,7.0.0)` accepts target-qualified Mineralogy 6 releases while +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.18.2 Forge release used for +this candidate is `4.0.10.118021`. The dependency range deliberately describes the supported +functional OreSpawn generation; Forge still prevents jars for another +Minecraft target from loading together. + +Pack maintainers should record the complete four-component versions in pack +manifests and support reports. Saying only “Mineralogy 6” identifies the +feature generation, not the exact jar. + +## Builds and release notes + +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.0.118021`. + +Every release note should state: + +- the Minecraft version and loader; +- the complete four-component version; +- the functional `Major.Minor.Bug` version; +- the features and fixes actually included; +- relevant migration, configuration, and compatibility information. + +The goal is a version that is useful to players, pack authors, mod developers, +release tooling, and support teams without pretending that all maintained +Minecraft branches contain identical implementation details. diff --git a/gradle.properties b/gradle.properties index 0747cb3bf..32cbe0f20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,59 +2,30 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false +org.gradle.configuration-cache=false +org.gradle.caching=true +org.gradle.parallel=false +net.minecraftforge.gradle.merge-source-sets=false +mod_version=6.1.0.118021 +mod_group=zone.moddev.mc.mineralogy -## Environment Properties - -# The Minecraft version must agree with the Forge version to get a valid artifact +# Release metadata consumed by the generic dispatcher. minecraft_version=1.18.2 -# The Minecraft version range can use any release version of Minecraft as bounds. -# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly -# as they do not follow standard versioning conventions. -minecraft_version_range=[1.18.2,1.19) -# The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=40.3.0 -orespawn_version=4.0.2 -# The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[40,) -# The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[40,) -# The mapping channel to use for mappings. -# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. -# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. -# -# | Channel | Version | | -# |-----------|----------------------|--------------------------------------------------------------------------------| -# | official | MCVersion | Official field/method names from Mojang mapping files | -# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | -# -# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. -# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md -# -# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. -# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started -mapping_channel=official -# The mapping version to query from the mapping channel. -# This must match the format required by the mapping channel. -mapping_version=1.18.2 +loader_name=forge +loader_code=1 +java_version=17 +java_toolchain_version=17.0.1+12 +gradle_java_version=17 +curseforge_project_id=240974 +mc_version=1.18.2 +forge_version=40.3.0 +mcp_mappings_channel=official +mcp_mappings_version=1.18.2 +mcp_version=20220404.173914 -## Mod Properties - -# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} -# Must match the String constant located in the main mod class annotated with @Mod. -mod_id=mineralogy -# The human-readable display name for the mod. -mod_name=Minecraft Mineralogy -# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. -mod_license=LGPL-2.1 -# The mod version. See https://semver.org/ -mod_version=6.0.0 -# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. -# This should match the base package used for the mod sources. -# See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=zone.moddev.mc.mineralogy -# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors=Cyanobacterium, SkyBlade1978, JRIwanek -# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=Fills the world with real-world rocks. +orespawn_version=4.0.10.118021 +orespawn_curse_project_id=245586 +orespawn_curse_file_id=8750114 +orespawn_sha256=BE863C3FDBEC50D36D74D2B06A462CDE1A3C6876BF587F8F52F6AFA0ED77E650 diff --git a/gradle/stage-orespawn-release.sh b/gradle/stage-orespawn-release.sh new file mode 100644 index 000000000..c17c4a37e --- /dev/null +++ b/gradle/stage-orespawn-release.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +set -euo pipefail + +repository="${1:?Usage: stage-orespawn-release.sh }" +value() { sed -n "s/^$1=//p" gradle.properties; } + +project_id="$(value orespawn_curse_project_id)" +file_id="$(value orespawn_curse_file_id)" +expected_sha="$(value orespawn_sha256)" +for required in project_id file_id expected_sha; do + if [[ -z "${!required}" ]]; then + echo "Missing OreSpawn release metadata: $required" >&2 + exit 1 + fi +done + +artifact_dir="$repository/curse/maven/mmd-orespawn-$project_id/$file_id" +artifact="$artifact_dir/mmd-orespawn-$project_id-$file_id.jar" +pom="$artifact_dir/mmd-orespawn-$project_id-$file_id.pom" +mkdir -p "$artifact_dir" +curl --fail --location --silent --show-error \ + --retry 5 --retry-all-errors --retry-delay 5 \ + "https://www.curseforge.com/api/v1/mods/$project_id/files/$file_id/download" \ + --output "$artifact" + +actual_sha="$(sha256sum "$artifact" | awk '{print toupper($1)}')" +if [[ "$actual_sha" != "${expected_sha^^}" ]]; then + echo "OreSpawn file $file_id has SHA-256 $actual_sha, expected ${expected_sha^^}" >&2 + exit 1 +fi +printf '%s\n' \ + '' \ + '' \ + ' 4.0.0' \ + " curse.maven" \ + " mmd-orespawn-$project_id" \ + " $file_id" \ + '' > "$pom" +echo "Staged exact OreSpawn file $file_id in $repository" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f..0d4a95168 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d1842103..2c68b418f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6c..cccdd3d51 100755 --- a/gradlew +++ b/gradlew @@ -1,129 +1,78 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# +#!/usr/bin/env sh ############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # Attempt to set APP_HOME - # Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} +APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" warn () { echo "$*" -} >&2 +} die () { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +81,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -140,101 +89,84 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg + i=$((i+1)) done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 53a6b238d..f9553162f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,91 +1,84 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/scripts/generate-locales.ps1 b/scripts/generate-locales.ps1 new file mode 100644 index 000000000..efea6d8c2 --- /dev/null +++ b/scripts/generate-locales.ps1 @@ -0,0 +1,56 @@ +[CmdletBinding()] +param( + [string] $SourceLocaleRoot = '' +) + +$SourceLocaleRoot = if ([string]::IsNullOrWhiteSpace($SourceLocaleRoot)) { + Join-Path $PSScriptRoot '..\..\..\MinecraftMineralogy 112\MinecraftMineralogy\src\main\resources\assets\mineralogy\lang' +} else { $SourceLocaleRoot } +$projectRoot = Split-Path -Parent $PSScriptRoot +$targetRoot = Join-Path $projectRoot 'src\main\resources\assets\mineralogy\lang' +$utf8NoBom = New-Object System.Text.UTF8Encoding($false) +$expectedLocales = @( + 'de_AU', 'de_DE', 'en_CA', 'en_EN', 'en_GB', 'en_PT', 'en_US', + 'es_ES', 'es_MX', 'fr_CA', 'fr_FR', 'ja_JP', 'ko_KR', 'pt_BR', + 'pt_PT', 'ru_RU', 'zh_CN' +) + +function Convert-Key([string] $key) { + if ($key -match '^tile\.mineralogy\.(.+)\.name$') { + return "block.mineralogy.$($Matches[1])" + } + if ($key -match '^item\.mineralogy\.(.+)\.name$') { + return "item.mineralogy.$($Matches[1])" + } + return $key +} + +New-Item -ItemType Directory -Force -Path $targetRoot | Out-Null +foreach ($locale in $expectedLocales) { + $source = Join-Path $SourceLocaleRoot "$locale.lang" + if (-not (Test-Path -LiteralPath $source)) { + throw "Missing reviewed Mineralogy 1.12 locale $source" + } + $translations = [ordered]@{} + foreach ($line in [IO.File]::ReadAllLines($source, [Text.Encoding]::UTF8)) { + if ([string]::IsNullOrWhiteSpace($line) -or $line.StartsWith('#')) { continue } + $equals = $line.IndexOf('=') + if ($equals -lt 1) { throw "Malformed locale line in ${source}: $line" } + $key = Convert-Key $line.Substring(0, $equals) + $value = $line.Substring($equals + 1) + if ($translations.Contains($key)) { throw "Duplicate mapped key $key in $source" } + $translations[$key] = $value + } + if ($translations.Count -ne 938) { + throw "Expected 938 mapped keys in $source, found $($translations.Count)" + } + $destination = Join-Path $targetRoot "$($locale.ToLowerInvariant()).json" + $json = ($translations | ConvertTo-Json -Depth 4) -replace "`r?`n", "`n" + [IO.File]::WriteAllText($destination, $json + "`n", $utf8NoBom) +} + +$actual = @(Get-ChildItem -LiteralPath $targetRoot -Filter '*.json' | Sort-Object Name) +if ($actual.Count -ne 17) { + throw "Expected exactly 17 generated locale files, found $($actual.Count)" +} +Write-Output 'Generated 17 reviewed Mineralogy 1.18.2 JSON locales with 938 ordered keys each.' diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 new file mode 100644 index 000000000..2d8c38906 --- /dev/null +++ b/scripts/generate-recipes.ps1 @@ -0,0 +1,1169 @@ +[CmdletBinding()] +param() + +$ErrorActionPreference = 'Stop' + +$projectRoot = Split-Path -Parent $PSScriptRoot +$recipeRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\recipes' +$advancementRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\advancements\recipes' +$minecraftRecipeRoot = Join-Path $projectRoot 'src\main\resources\data\minecraft\recipes' +$minecraftAdvancementRoot = Join-Path $projectRoot 'src\main\resources\data\minecraft\advancements\recipes' +$itemTagRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\tags\items' +$blockTagRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\tags\blocks' +$utf8NoBom = New-Object System.Text.UTF8Encoding($false) +$generatedNames = New-Object 'System.Collections.Generic.HashSet[string]' +$unlockSources = @{} + +$families = @( + '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' +) + +$colors = @( + 'black', 'red', 'green', 'brown', 'blue', 'purple', 'cyan', 'silver', + 'gray', 'pink', 'lime', 'yellow', 'light_blue', 'magenta', 'orange', 'white' +) + +# Minecraft owns these full-block identities in 1.18.2. Mineralogy keeps its +# legacy blocks registered, but recipes may accept either identity where doing +# so cannot compete with a native recipe. +$nativeFullBlocks = @{ + andesite = @{ raw = 'minecraft:andesite'; smooth = 'minecraft:polished_andesite' } + basalt = @{ raw = 'minecraft:basalt'; smooth = 'minecraft:polished_basalt' } + diorite = @{ raw = 'minecraft:diorite'; smooth = 'minecraft:polished_diorite' } + granite = @{ raw = 'minecraft:granite'; smooth = 'minecraft:polished_granite' } + tuff = @{ raw = 'minecraft:tuff' } +} + +$nativeConstructionForms = @{ + andesite = @{ raw = @('stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + diorite = @{ raw = @('stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + granite = @{ raw = @('stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } +} + +$nativeExactRecipeInputs = @{ + # Raw-to-smooth remains exact because the native polished override uses + # the same block-plus-sand route. Native construction forms remain native. + andesite = @{ raw = @('smooth', 'stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + basalt = @{ raw = @('smooth') } + diorite = @{ raw = @('smooth', 'stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + granite = @{ raw = @('smooth', 'stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } +} + +function ItemId([string] $path) { + return "mineralogy:$path" +} + +function ItemCondition([string] $item) { + return [ordered]@{ type = 'forge:item_exists'; item = $item } +} + +function ConfigCondition([string] $flag) { + return [ordered]@{ type = 'mineralogy:config'; flag = $flag } +} + +function NotCondition([System.Collections.IDictionary] $condition) { + return [ordered]@{ type = 'forge:not'; value = $condition } +} + +function ItemTagNotEmptyCondition([string] $tag) { + return [ordered]@{ + type = 'forge:not' + value = [ordered]@{ type = 'forge:tag_empty'; tag = $tag } + } +} + +function ItemIngredient([string] $item, [object] $data = $null) { + if ($null -ne $data) { + if ($item -eq 'minecraft:sand') { + $item = if ([int]$data -eq 1) { 'minecraft:red_sand' } else { 'minecraft:sand' } + } + elseif ($item -eq 'minecraft:coal' -and [int]$data -eq 1) { + $item = 'minecraft:charcoal' + } + elseif ($item -eq 'minecraft:dye') { + $dyes = @('ink_sac', 'red_dye', 'green_dye', 'cocoa_beans', 'lapis_lazuli', + 'purple_dye', 'cyan_dye', 'light_gray_dye', 'gray_dye', 'pink_dye', + 'lime_dye', 'yellow_dye', 'light_blue_dye', 'magenta_dye', + 'orange_dye', 'bone_meal') + $item = "minecraft:$($dyes[[int]$data])" + } + } + $ingredient = [ordered]@{ item = $item } + return $ingredient +} + +function AdvancementPredicate([object] $ingredient) { + if ($ingredient -is [System.Collections.IDictionary]) { + if ($ingredient.Contains('item')) { + return [ordered]@{ items = @([string]$ingredient['item']) } + } + if ($ingredient.Contains('tag')) { + return [ordered]@{ tag = [string]$ingredient['tag'] } + } + if ($ingredient.Contains('items')) { + return [ordered]@{ items = @($ingredient['items']) } + } + } + if ($null -ne $ingredient.PSObject.Properties['item']) { + return [ordered]@{ items = @([string]$ingredient.item) } + } + if ($null -ne $ingredient.PSObject.Properties['tag']) { + return [ordered]@{ tag = [string]$ingredient.tag } + } + if ($null -ne $ingredient.PSObject.Properties['items']) { + return [ordered]@{ items = @($ingredient.items) } + } + throw "Cannot convert recipe ingredient into a Minecraft 1.18 advancement predicate" +} + +function OreIngredient([string] $ore) { + if ($ore -eq 'sand') { return [ordered]@{ tag = 'forge:sand' } } + if ($ore -eq 'paper') { return [ordered]@{ tag = 'forge:paper' } } + if ($ore -eq 'drywallWhite') { return [ordered]@{ tag = 'mineralogy:drywall/white' } } + if ($ore -eq 'lampRocksalt') { return [ordered]@{ tag = 'forge:lamps/rock_salt' } } + if ($ore -match '^dust(.+)$') { + $name = $Matches[1] -replace 'Rock_salt', 'rock_salt' + return [ordered]@{ tag = "forge:dusts/$($name.ToLowerInvariant())" } + } + if ($ore -match '^block(.+)$') { + $name = $Matches[1] -replace 'Rocksalt', 'rock_salt' + return [ordered]@{ tag = "forge:storage_blocks/$($name.ToLowerInvariant())" } + } + if ($ore -match '^stone(.+?)(SmoothBrick|Smooth|Brick)?$') { + $family = Convert-CamelToSnake $Matches[1] + $finish = if ($Matches[2]) { '/' + (Convert-CamelToSnake $Matches[2]) } else { '' } + return [ordered]@{ tag = "mineralogy:stones/$family$finish" } + } + if ($ore -match '^slab(.+?)(SmoothBrick|Smooth|Brick)?$') { + $family = Convert-CamelToSnake $Matches[1] + $finish = if ($Matches[2]) { '/' + (Convert-CamelToSnake $Matches[2]) } else { '' } + return [ordered]@{ tag = "mineralogy:slabs/$family$finish" } + } + throw "No Minecraft 1.18.2 tag mapping for legacy OreDictionary key $ore" +} + +function Convert-CamelToSnake([string] $value) { + return (($value -creplace '([a-z0-9])([A-Z])', '$1_$2').ToLowerInvariant()) +} + +function RecipeResult([string] $item, [int] $count) { + return [ordered]@{ item = $item; count = $count } +} + +function VanillaResult([string] $item, [int] $count = 1) { + $result = [ordered]@{ item = $item } + if ($count -ne 1) { $result.count = $count } + return $result +} + +function VanillaShapedRecipe( + [string[]] $pattern, + [System.Collections.IDictionary] $key, + [string] $result, + [int] $count = 1 +) { + return [ordered]@{ + type = 'minecraft:crafting_shaped' + pattern = $pattern + key = $key + result = VanillaResult $result $count + } +} + +function VanillaShapelessRecipe( + [object[]] $ingredients, + [string] $result, + [int] $count = 1, + [string] $group = '' +) { + $recipe = [ordered]@{ + type = 'minecraft:crafting_shapeless' + ingredients = $ingredients + result = VanillaResult $result $count + } + if (-not [string]::IsNullOrWhiteSpace($group)) { + $recipe.Insert(1, 'group', $group) + } + return $recipe +} + +function VanillaStonecuttingRecipe( + [object] $ingredient, + [string] $result, + [int] $count +) { + return [ordered]@{ + type = 'minecraft:stonecutting' + ingredient = $ingredient + result = $result + count = $count + } +} + +function Write-ConditionalMinecraftRecipe( + [string] $name, + [System.Collections.IDictionary] $condition, + [System.Collections.IDictionary] $enabledRecipe, + [System.Collections.IDictionary] $fallbackRecipe +) { + Write-Json (Join-Path $minecraftRecipeRoot "$name.json") ([ordered]@{ + type = 'forge:conditional' + recipes = @( + [ordered]@{ conditions = @($condition); recipe = $enabledRecipe }, + [ordered]@{ conditions = @((NotCondition $condition)); recipe = $fallbackRecipe } + ) + }) +} + +function ConditionsFor([string] $result, [object[]] $extra = @()) { + return @($extra) + @((ItemCondition $result)) +} + +function Write-Json([string] $path, [System.Collections.IDictionary] $value) { + $json = ($value | ConvertTo-Json -Depth 20) -replace "`r?`n", "`n" + [System.IO.File]::WriteAllText($path, $json + "`n", $utf8NoBom) +} + +function Write-Recipe([string] $name, [System.Collections.IDictionary] $recipe) { + if (-not $generatedNames.Add($name)) { + throw "Duplicate generated recipe name: $name" + } + Write-Json (Join-Path $recipeRoot "$name.json") $recipe +} + +function Register-UnlockSource( + [string] $name, + [object] $sourceIngredient +) { + if ($unlockSources.ContainsKey($name)) { + throw "Duplicate recipe-book unlock source: $name" + } + $unlockSources[$name] = if ($sourceIngredient -is [string]) { + ItemIngredient ([string]$sourceIngredient) + } + else { + $sourceIngredient + } +} + +function Get-SandUnlockMode([string] $recipeName) { + if ($recipeName -match '^(.+)_smooth$') { + return 'normal' + } + if ($recipeName -match '^(.+)_(raw|brick)_(stairs|slab|wall)_polishing$' -or + $recipeName -match '^(.+)_brick_block_polishing$') { + return 'ore_dictionary' + } + return '' +} + +function Add-SandUnlockCriteria( + [System.Collections.IDictionary] $criteria, + [string] $sandMode +) { + if ([string]::IsNullOrWhiteSpace($sandMode)) { + return + } + + $criteria['has_sand'] = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ + items = @([ordered]@{ items = @('minecraft:sand') }) + } + } + if ($sandMode -eq 'ore_dictionary') { + $criteria['has_red_sand'] = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ + items = @([ordered]@{ items = @('minecraft:red_sand') }) + } + } + } +} + +function Get-UnlockRequirements([string] $sandMode) { + $requirements = @() + $requirements += ,@('has_the_recipe', 'has_rock') + if ($sandMode -eq 'ore_dictionary') { + $requirements += ,@('has_the_recipe', 'has_sand', 'has_red_sand') + } + elseif ($sandMode -eq 'normal') { + $requirements += ,@('has_the_recipe', 'has_sand') + } + return ,$requirements +} + +function Resolve-UnlockIngredient([object] $ingredient) { + if ($null -ne $ingredient.item) { + return [ordered]@{ item = [string]$ingredient.item } + } + if ($null -ne $ingredient.tag) { + return [ordered]@{ tag = [string]$ingredient.tag } + } + return $null +} + +function Infer-UnlockSource([string] $recipeName, [object] $recipe) { + if ($unlockSources.ContainsKey($recipeName)) { return $unlockSources[$recipeName] } + if ($null -ne $recipe.ingredients -and $recipe.ingredients.Count -gt 0) { + return Resolve-UnlockIngredient $recipe.ingredients[0] + } + if ($null -ne $recipe.ingredient) { return Resolve-UnlockIngredient $recipe.ingredient } + if ($null -ne $recipe.key) { + $first = $recipe.key.PSObject.Properties | Select-Object -First 1 + if ($null -ne $first) { return Resolve-UnlockIngredient $first.Value } + } + return $null +} + +function Matrix-Contains( + [System.Collections.IDictionary] $matrix, + [string] $family, + [string] $finish, + [string] $form +) { + return $matrix.ContainsKey($family) -and + $matrix[$family].ContainsKey($finish) -and + $matrix[$family][$finish] -contains $form +} + +function ConstructionFormIngredient( + [string] $family, + [string] $finish, + [string] $form, + [string] $mineralogyItem, + [string] $familyOreName +) { + if (Matrix-Contains $nativeExactRecipeInputs $family $finish $form) { + return ItemIngredient $mineralogyItem + } + # Slabs historically use exact inputs. Widen only a native family whose + # matching vanilla block has no target-native slab recipe (basalt here). + if ($form -eq 'slab' -and -not $nativeFullBlocks.ContainsKey($family)) { + return ItemIngredient $mineralogyItem + } + return OreIngredient $familyOreName +} + +function NativeTagAliases( + [string] $kind, + [string] $family, + [string] $finish +) { + if (-not $nativeFullBlocks.ContainsKey($family)) { + return @() + } + $nativeFinish = if ([string]::IsNullOrWhiteSpace($finish)) { 'raw' } else { $finish } + if ($nativeFinish -notin @('raw', 'smooth')) { + return @() + } + if (-not $nativeFullBlocks[$family].ContainsKey($nativeFinish)) { + return @() + } + if ($kind -eq 'stones') { + if ($family -eq 'basalt' -and $nativeFinish -eq 'smooth') { + return @($nativeFullBlocks[$family][$nativeFinish], 'minecraft:smooth_basalt') + } + return @($nativeFullBlocks[$family][$nativeFinish]) + } + if ($kind -eq 'slabs' -and + (Matrix-Contains $nativeConstructionForms $family $nativeFinish 'slab')) { + $prefix = if ($nativeFinish -eq 'smooth') { 'polished_' } else { '' } + return @("minecraft:${prefix}${family}_slab") + } + return @() +} + +function Write-ShapedRecipe( + [string] $name, + [string] $type, + [string[]] $pattern, + [System.Collections.IDictionary] $key, + [string] $result, + [int] $count, + [object[]] $conditions +) { + if ($type.StartsWith('forge:ore_')) { $type = 'minecraft:crafting_shaped' } + Write-Recipe $name ([ordered]@{ + conditions = $conditions + type = $type + pattern = $pattern + key = $key + result = RecipeResult $result $count + }) +} + +function Write-ShapelessRecipe( + [string] $name, + [string] $type, + [object[]] $ingredients, + [string] $result, + [int] $count, + [object[]] $conditions +) { + if ($type.StartsWith('forge:ore_')) { $type = 'minecraft:crafting_shapeless' } + Write-Recipe $name ([ordered]@{ + conditions = $conditions + type = $type + ingredients = $ingredients + result = RecipeResult $result $count + }) +} + +function FamilyOreName([string] $prefix, [string] $family, [string] $suffix = '') { + $material = $family.Substring(0, 1).ToUpperInvariant() + $family.Substring(1) + return "$prefix$material$suffix" +} + +function Write-BaseFamilyRecipes([string] $family) { + $raw = ItemId $family + $rawOre = FamilyOreName 'stone' $family + $brick = ItemId "${family}_brick" + $brickOre = FamilyOreName 'stone' $family 'Brick' + $smooth = ItemId "${family}_smooth" + $smoothOre = FamilyOreName 'stone' $family 'Smooth' + $smoothBrick = ItemId "${family}_smooth_brick" + $smoothBrickOre = FamilyOreName 'stone' $family 'SmoothBrick' + + Write-ShapelessRecipe "${family}_cobblestone" 'forge:ore_shapeless' @( + (OreIngredient $rawOre), (OreIngredient $rawOre), + (ItemIngredient 'minecraft:gravel'), (ItemIngredient 'minecraft:gravel') + ) 'minecraft:cobblestone' 4 @() + + Write-ShapedRecipe "${family}_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'stairs' $raw $rawOre }) ` + (ItemId "${family}_stairs") 4 ` + (ConditionsFor (ItemId "${family}_stairs")) + Write-ShapedRecipe "${family}_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'slab' $raw $rawOre }) ` + (ItemId "${family}_slab") 6 ` + (ConditionsFor (ItemId "${family}_slab")) + Write-ShapedRecipe "${family}_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_furnace") 1 (ConditionsFor (ItemId "${family}_furnace")) + Write-ShapedRecipe "${family}_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'wall' $raw $rawOre }) ` + (ItemId "${family}_wall") 6 ` + (ConditionsFor (ItemId "${family}_wall")) + + Write-ShapedRecipe "${family}_brick" 'forge:ore_shaped' @('xx', 'xx') ` + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'brick' $raw $rawOre }) ` + $brick 4 (ConditionsFor $brick) + Write-ShapedRecipe "${family}_brick_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = OreIngredient $brickOre }) (ItemId "${family}_brick_stairs") 4 ` + (ConditionsFor (ItemId "${family}_brick_stairs")) + Write-ShapedRecipe "${family}_brick_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $brick }) (ItemId "${family}_brick_slab") 6 ` + (ConditionsFor (ItemId "${family}_brick_slab")) + Write-ShapedRecipe "${family}_brick_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family 'Brick'); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_brick_furnace") 1 (ConditionsFor (ItemId "${family}_brick_furnace")) + Write-ShapedRecipe "${family}_brick_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = OreIngredient $brickOre }) (ItemId "${family}_brick_wall") 6 ` + (ConditionsFor (ItemId "${family}_brick_wall")) + + Write-ShapelessRecipe "${family}_smooth" 'forge:ore_shapeless' @( + (ConstructionFormIngredient $family 'raw' 'smooth' $raw $rawOre), + (ItemIngredient 'minecraft:sand' 0) + ) $smooth 1 (ConditionsFor $smooth) + Write-ShapedRecipe "${family}_smooth_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = ConstructionFormIngredient $family 'smooth' 'stairs' $smooth $smoothOre }) ` + (ItemId "${family}_smooth_stairs") 4 ` + (ConditionsFor (ItemId "${family}_smooth_stairs")) + Write-ShapedRecipe "${family}_smooth_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ConstructionFormIngredient $family 'smooth' 'slab' $smooth $smoothOre }) ` + (ItemId "${family}_smooth_slab") 6 ` + (ConditionsFor (ItemId "${family}_smooth_slab")) + Write-ShapedRecipe "${family}_smooth_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family 'Smooth'); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_smooth_furnace") 1 (ConditionsFor (ItemId "${family}_smooth_furnace")) + Write-ShapedRecipe "${family}_smooth_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = ConstructionFormIngredient $family 'smooth' 'wall' $smooth $smoothOre }) ` + (ItemId "${family}_smooth_wall") 6 ` + (ConditionsFor (ItemId "${family}_smooth_wall")) + + Write-ShapedRecipe "${family}_smooth_brick" 'forge:ore_shaped' @('xx', 'xx') ` + ([ordered]@{ x = OreIngredient $smoothOre }) $smoothBrick 4 (ConditionsFor $smoothBrick) + Write-ShapedRecipe "${family}_smooth_brick_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = OreIngredient $smoothBrickOre }) (ItemId "${family}_smooth_brick_stairs") 4 ` + (ConditionsFor (ItemId "${family}_smooth_brick_stairs")) + Write-ShapedRecipe "${family}_smooth_brick_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $smoothBrick }) (ItemId "${family}_smooth_brick_slab") 6 ` + (ConditionsFor (ItemId "${family}_smooth_brick_slab")) + Write-ShapedRecipe "${family}_smooth_brick_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family 'SmoothBrick'); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_smooth_brick_furnace") 1 (ConditionsFor (ItemId "${family}_smooth_brick_furnace")) + Write-ShapedRecipe "${family}_smooth_brick_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = OreIngredient $smoothBrickOre }) (ItemId "${family}_smooth_brick_wall") 6 ` + (ConditionsFor (ItemId "${family}_smooth_brick_wall")) +} + +function Write-ReliefRecipes([string] $family) { + $smooth = ItemId "${family}_smooth" + $smoothOre = FamilyOreName 'stone' $family 'Smooth' + $smoothIngredient = if ($nativeFullBlocks.ContainsKey($family)) { + OreIngredient $smoothOre + } + else { + ItemIngredient $smooth + } + $blank = ItemId "${family}_relief_blank" + $left = ItemId "${family}_relief_left" + + Write-ShapedRecipe "${family}_relief_blank" 'minecraft:crafting_shaped' @('xxx', 'xxx', 'xxx') ` + ([ordered]@{ x = $smoothIngredient }) $blank 16 (ConditionsFor $blank) + Write-ShapedRecipe "${family}_relief_cross" 'minecraft:crafting_shaped' @('x x', ' ', 'x x') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_cross") 4 ` + (ConditionsFor (ItemId "${family}_relief_cross")) + Write-ShapedRecipe "${family}_relief_hammer" 'minecraft:crafting_shaped' @('zxz', 'zyz', 'zzz') ` + ([ordered]@{ x = ItemIngredient $smooth; y = ItemIngredient 'minecraft:stick'; z = ItemIngredient $blank }) ` + (ItemId "${family}_relief_hammer") 7 (ConditionsFor (ItemId "${family}_relief_hammer")) + Write-ShapedRecipe "${family}_relief_horizontal" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_horizontal") 3 ` + (ConditionsFor (ItemId "${family}_relief_horizontal")) + Write-ShapedRecipe "${family}_relief_left" 'minecraft:crafting_shaped' @('x ', ' x ', ' x') ` + ([ordered]@{ x = ItemIngredient $blank }) $left 3 ` + (ConditionsFor (ItemId "${family}_relief_left")) + Write-ShapedRecipe "${family}_relief_plus" 'minecraft:crafting_shaped' @(' x ', 'xxx', ' x ') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_plus") 5 ` + (ConditionsFor (ItemId "${family}_relief_plus")) + Write-ShapelessRecipe "${family}_relief_right" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $left), (ItemIngredient $left)) (ItemId "${family}_relief_right") 2 ` + (ConditionsFor (ItemId "${family}_relief_right")) + Write-ShapedRecipe "${family}_relief_i" 'minecraft:crafting_shaped' @('xxx', ' x ', 'xxx') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_i") 7 ` + (ConditionsFor (ItemId "${family}_relief_i")) + Write-ShapedRecipe "${family}_relief_vertical" 'minecraft:crafting_shaped' @('x', 'x', 'x') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_vertical") 3 ` + (ConditionsFor (ItemId "${family}_relief_vertical")) + + foreach ($tool in @('axe', 'hoe', 'pickaxe', 'sword')) { + $ingredients = @() + for ($index = 0; $index -lt 8; $index++) { + $ingredients += ,(ItemIngredient $blank) + } + $ingredients += ,(ItemIngredient "minecraft:stone_$tool" 0) + $result = ItemId "${family}_relief_${tool}" + Write-ShapelessRecipe "${family}_relief_${tool}" 'minecraft:crafting_shapeless' ` + $ingredients $result 8 (ConditionsFor $result) + } +} + +function Write-ConstructionRecipes([string] $family) { + $forms = [ordered]@{ + raw = [ordered]@{ block = ItemId $family; stairs = ItemId "${family}_stairs"; slab = ItemId "${family}_slab"; wall = ItemId "${family}_wall" } + brick = [ordered]@{ block = ItemId "${family}_brick"; stairs = ItemId "${family}_brick_stairs"; slab = ItemId "${family}_brick_slab"; wall = ItemId "${family}_brick_wall" } + polished = [ordered]@{ block = ItemId "${family}_smooth"; stairs = ItemId "${family}_smooth_stairs"; slab = ItemId "${family}_smooth_slab"; wall = ItemId "${family}_smooth_wall" } + polished_brick = [ordered]@{ block = ItemId "${family}_smooth_brick"; stairs = ItemId "${family}_smooth_brick_stairs"; slab = ItemId "${family}_smooth_brick_slab"; wall = ItemId "${family}_smooth_brick_wall" } + } + + foreach ($finish in $forms.Keys) { + $form = $forms[$finish] + Write-ShapelessRecipe "${family}_${finish}_slab_recombination" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $form.slab), (ItemIngredient $form.slab)) $form.block 1 ` + @((ItemCondition $form.slab), (ItemCondition $form.block)) + Register-UnlockSource "${family}_${finish}_slab_recombination" $form.slab + } + + foreach ($conversion in @( + [ordered]@{ name = 'raw'; source = $forms.raw; target = $forms.brick }, + [ordered]@{ name = 'polished'; source = $forms.polished; target = $forms.polished_brick } + )) { + foreach ($shape in @('stairs', 'slab', 'wall')) { + $plural = if ($shape -eq 'slab') { 'slabs' } elseif ($shape -eq 'wall') { 'walls' } else { 'stairs' } + Write-ShapedRecipe "${family}_$($conversion.name)_${plural}_to_brick" 'minecraft:crafting_shaped' ` + @('xx', 'xx') ([ordered]@{ x = ItemIngredient $conversion.source[$shape] }) ` + $conversion.target[$shape] 4 ` + @((ItemCondition $conversion.source[$shape]), (ItemCondition $conversion.target[$shape])) + Register-UnlockSource "${family}_$($conversion.name)_${plural}_to_brick" ` + $conversion.source[$shape] + } + } + + foreach ($polishing in @( + [ordered]@{ name = 'raw'; source = $forms.raw; target = $forms.polished }, + [ordered]@{ name = 'brick'; source = $forms.brick; target = $forms.polished_brick } + )) { + foreach ($shape in @('stairs', 'slab', 'wall')) { + Write-ShapelessRecipe "${family}_$($polishing.name)_${shape}_polishing" 'forge:ore_shapeless' ` + @((ItemIngredient $polishing.source[$shape]), (OreIngredient 'sand')) ` + $polishing.target[$shape] 1 ` + @((ItemCondition $polishing.source[$shape]), (ItemCondition $polishing.target[$shape])) + Register-UnlockSource "${family}_$($polishing.name)_${shape}_polishing" ` + $polishing.source[$shape] + } + } + + Write-ShapelessRecipe "${family}_brick_block_polishing" 'forge:ore_shapeless' ` + @((ItemIngredient $forms.brick.block), (OreIngredient 'sand')) $forms.polished_brick.block 1 ` + @((ItemCondition $forms.brick.block), (ItemCondition $forms.polished_brick.block)) + Register-UnlockSource "${family}_brick_block_polishing" $forms.brick.block +} + +function Write-GlobalRecipes() { + $drywallCondition = ConfigCondition 'ENABLE_DRYWALLS' + for ($metadata = 0; $metadata -lt $colors.Count; $metadata++) { + $result = ItemId "drywall_$($colors[$metadata])" + Write-ShapelessRecipe "drywall_$($colors[$metadata])" 'forge:ore_shapeless' @( + (OreIngredient 'drywallWhite'), (ItemIngredient 'minecraft:dye' $metadata) + ) $result 1 (ConditionsFor $result @($drywallCondition)) + Register-UnlockSource "drywall_$($colors[$metadata])" (ItemId 'drywall_white') + } + + $dustCondition = ConfigCondition 'ENABLE_MINERAL_DUSTS' + $gunpowderTail = @((OreIngredient 'dustNitrate'), (OreIngredient 'dustSulfur')) + Write-ShapelessRecipe 'gunpowder_from_sugar' 'forge:ore_shapeless' ` + (@((ItemIngredient 'minecraft:sugar')) + $gunpowderTail) 'minecraft:gunpowder' 4 @($dustCondition) + Register-UnlockSource 'gunpowder_from_sugar' (ItemId 'nitrate_dust') + Write-ShapelessRecipe 'gunpowder_from_charcoal' 'forge:ore_shapeless' ` + (@((ItemIngredient 'minecraft:coal' 1)) + $gunpowderTail) 'minecraft:gunpowder' 4 @($dustCondition) + Register-UnlockSource 'gunpowder_from_charcoal' (ItemId 'nitrate_dust') + Write-ShapelessRecipe 'gunpowder_from_carbon_dust' 'forge:ore_shapeless' ` + (@((OreIngredient 'dustCarbon')) + $gunpowderTail) 'minecraft:gunpowder' 4 ` + @($dustCondition, (ItemTagNotEmptyCondition 'forge:dusts/carbon')) + Register-UnlockSource 'gunpowder_from_carbon_dust' (ItemId 'nitrate_dust') + Write-ShapelessRecipe 'gunpowder_from_coal_dust' 'forge:ore_shapeless' ` + (@((OreIngredient 'dustCoal')) + $gunpowderTail) 'minecraft:gunpowder' 4 ` + @($dustCondition, (ItemTagNotEmptyCondition 'forge:dusts/coal')) + Register-UnlockSource 'gunpowder_from_coal_dust' (ItemId 'nitrate_dust') + + Write-ShapelessRecipe 'mineralfertilizer' 'forge:ore_shapeless' @( + (OreIngredient 'dustNitrate'), (OreIngredient 'dustPhosphorous') + ) (ItemId 'mineral_fertilizer') 1 ` + (ConditionsFor (ItemId 'mineral_fertilizer') @((ConfigCondition 'ENABLE_MINERAL_FERTILIZER'))) + Register-UnlockSource 'mineralfertilizer' (ItemId 'nitrate_dust') + + Write-ShapelessRecipe 'cobblestone' 'minecraft:crafting_shapeless' @( + (ItemIngredient 'minecraft:stone' 0), (ItemIngredient 'minecraft:stone' 0), + (ItemIngredient 'minecraft:gravel'), (ItemIngredient 'minecraft:gravel') + ) 'minecraft:cobblestone' 4 @() + Register-UnlockSource 'cobblestone' 'minecraft:stone' + + foreach ($storage in @( + [ordered]@{ name = 'gypsum'; dust = 'dustGypsum'; blockOre = 'blockGypsum'; dustItem = 'gypsum_dust'; blockItem = 'gypsum' }, + [ordered]@{ name = 'chalk'; dust = 'dustChalk'; blockOre = 'blockChalk'; dustItem = 'chalk_dust'; blockItem = 'chalk' }, + [ordered]@{ name = 'rock_salt'; dust = 'dustRock_salt'; blockOre = 'blockRocksalt'; dustItem = 'rock_salt_dust'; blockItem = 'rock_salt' } + )) { + $block = ItemId $storage.blockItem + Write-ShapedRecipe $storage.name 'forge:ore_shaped' @('xx', 'xx') ` + ([ordered]@{ x = OreIngredient $storage.dust }) $block 1 (ConditionsFor $block) + Register-UnlockSource $storage.name (ItemId $storage.dustItem) + Write-ShapelessRecipe "$($storage.name)_dust" 'forge:ore_shapeless' @( + (OreIngredient $storage.blockOre) + ) (ItemId $storage.dustItem) 4 (ConditionsFor (ItemId $storage.dustItem)) + Register-UnlockSource "$($storage.name)_dust" $block + } + + Write-ShapedRecipe 'drywall' 'forge:ore_shaped' @('pgp', 'pgp', 'pgp') ` + ([ordered]@{ p = OreIngredient 'paper'; g = OreIngredient 'dustGypsum' }) ` + (ItemId 'drywall_white') 3 ` + (ConditionsFor (ItemId 'drywall_white') @($drywallCondition)) + Register-UnlockSource 'drywall' (ItemId 'gypsum_dust') + + $lampCondition = ConfigCondition 'ENABLE_ROCK_SALT_LAMPS' + Write-ShapelessRecipe 'rocksaltlamp' 'minecraft:crafting_shapeless' @( + (ItemIngredient (ItemId 'rock_salt')), (ItemIngredient 'minecraft:torch'), + (ItemIngredient 'minecraft:iron_ingot') + ) (ItemId 'rocksaltlamp') 1 ` + (ConditionsFor (ItemId 'rocksaltlamp') @($lampCondition)) + Register-UnlockSource 'rocksaltlamp' (ItemId 'rock_salt') + Write-ShapedRecipe 'rocksaltstreetlamp' 'forge:ore_shaped' @('x', 'y', 'y') ` + ([ordered]@{ x = OreIngredient 'lampRocksalt'; y = ItemIngredient 'minecraft:iron_ingot' }) ` + (ItemId 'rocksaltstreetlamp') 1 ` + (ConditionsFor (ItemId 'rocksaltstreetlamp') @($lampCondition)) + Register-UnlockSource 'rocksaltstreetlamp' (ItemId 'rocksaltlamp') + + foreach ($mineral in @('sulfur', 'phosphorous', 'nitrate')) { + $material = $mineral.Substring(0, 1).ToUpperInvariant() + $mineral.Substring(1) + $block = ItemId "${mineral}_block" + $dust = ItemId "${mineral}_dust" + Write-ShapedRecipe "${mineral}_block" 'minecraft:crafting_shaped' @('xxx', 'xxx', 'xxx') ` + ([ordered]@{ x = ItemIngredient $dust }) $block 1 ` + (ConditionsFor $block @($dustCondition)) + Register-UnlockSource "${mineral}_block" $dust + Write-ShapelessRecipe "${mineral}_dust" 'forge:ore_shapeless' @( + (OreIngredient "block$material") + ) $dust 9 (ConditionsFor $dust @($dustCondition)) + Register-UnlockSource "${mineral}_dust" $block + } +} + +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('_') } + $created = 0 + foreach ($recipeFile in $recipeFiles) { + $recipeName = $recipeFile.BaseName + $advancementFile = Join-Path $advancementRoot "$recipeName.json" + if (Test-Path -LiteralPath $advancementFile) { + continue + } + $recipe = Get-Content -LiteralPath $recipeFile.FullName -Raw | ConvertFrom-Json + $sourceIngredient = Infer-UnlockSource $recipeName $recipe + if ($null -eq $sourceIngredient) { + throw "Generated recipe $recipeName has no direct recipe-book unlock source" + } + $criteria = [ordered]@{ + has_the_recipe = [ordered]@{ + trigger = 'minecraft:recipe_unlocked' + conditions = [ordered]@{ recipe = "mineralogy:$recipeName" } + } + has_rock = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ + items = @((AdvancementPredicate $sourceIngredient)) + } + } + } + $sandMode = Get-SandUnlockMode $recipeName + Add-SandUnlockCriteria $criteria $sandMode + $requirements = Get-UnlockRequirements $sandMode + + $generatedAdvancement = [ordered]@{} + if ($null -ne $recipe.conditions) { + $generatedAdvancement.conditions = @($recipe.conditions) + } + $generatedAdvancement.rewards = [ordered]@{ recipes = @("mineralogy:$recipeName") } + $generatedAdvancement.criteria = $criteria + $generatedAdvancement.requirements = $requirements + Write-Json $advancementFile $generatedAdvancement + $created++ + } + return $created +} + +function Synchronize-AdvancementConditions() { + $files = Get-ChildItem -LiteralPath $advancementRoot -Filter '*.json' + foreach ($file in $files) { + $advancement = Get-Content -LiteralPath $file.FullName -Raw | ConvertFrom-Json + $recipeId = [string]$advancement.rewards.recipes[0] + if (-not $recipeId.StartsWith('mineralogy:')) { + throw "Unexpected recipe reward in $($file.FullName): $recipeId" + } + $recipeName = $recipeId.Substring('mineralogy:'.Length) + $recipeFile = Join-Path $recipeRoot "$recipeName.json" + if (-not (Test-Path -LiteralPath $recipeFile)) { + throw "Advancement $($file.Name) references missing generated recipe $recipeId" + } + $recipe = Get-Content -LiteralPath $recipeFile -Raw | ConvertFrom-Json + if ($recipeName -match '^(.+)_relief_(.+)$') { + $family = $Matches[1] + $relief = $Matches[2] + if ($relief -eq 'blank') { + $sourceIngredient = if ($nativeFullBlocks.ContainsKey($family)) { + OreIngredient (FamilyOreName 'stone' $family 'Smooth') + } + else { + ItemIngredient "mineralogy:${family}_smooth" + } + } + elseif ($relief -eq 'right') { + $sourceIngredient = ItemIngredient "mineralogy:${family}_relief_left" + } + else { + $sourceIngredient = ItemIngredient "mineralogy:${family}_relief_blank" + } + $advancement.criteria.has_rock.conditions.items = @((AdvancementPredicate $sourceIngredient)) + } + if ($null -eq $advancement.criteria.has_the_recipe -or $null -eq $advancement.criteria.has_rock) { + throw "Advancement $($file.Name) must have self-recipe and direct-input criteria" + } + $criteria = [ordered]@{} + foreach ($criterion in $advancement.criteria.PSObject.Properties) { + if ($criterion.Name -notin @('has_material_recipe', 'has_sand', 'has_red_sand', 'has_furnace')) { + $criteria[$criterion.Name] = $criterion.Value + } + } + $sandMode = Get-SandUnlockMode $recipeName + Add-SandUnlockCriteria $criteria $sandMode + $requirements = Get-UnlockRequirements $sandMode + + $ordered = [ordered]@{} + if ($null -ne $recipe.conditions) { + $ordered.conditions = @($recipe.conditions) + } + foreach ($property in $advancement.PSObject.Properties) { + if ($property.Name -eq 'criteria') { + $ordered[$property.Name] = $criteria + } + elseif ($property.Name -eq 'requirements') { + $ordered[$property.Name] = $requirements + } + elseif ($property.Name -ne 'conditions') { + $ordered[$property.Name] = $property.Value + } + } + Write-Json $file.FullName $ordered + } + return $files.Count +} + +function Prepare-TargetDirectories() { + New-Item -ItemType Directory -Force -Path $recipeRoot | Out-Null + New-Item -ItemType Directory -Force -Path $advancementRoot | Out-Null + New-Item -ItemType Directory -Force -Path $minecraftRecipeRoot | Out-Null + New-Item -ItemType Directory -Force -Path $minecraftAdvancementRoot | Out-Null + + foreach ($file in Get-ChildItem -LiteralPath $recipeRoot -Filter '*.json') { + $recipe = Get-Content -LiteralPath $file.FullName -Raw | ConvertFrom-Json + if ($recipe.type -eq 'minecraft:smelting') { + if ($null -eq $recipe.ingredient.item) { + throw "Smelting recipe $($file.Name) has no direct item ingredient" + } + Register-UnlockSource $file.BaseName ([string]$recipe.ingredient.item) + } + else { + Remove-Item -LiteralPath $file.FullName + } + } + foreach ($file in Get-ChildItem -LiteralPath $advancementRoot -Filter '*.json') { + Remove-Item -LiteralPath $file.FullName + } + foreach ($file in Get-ChildItem -LiteralPath $minecraftRecipeRoot -Filter '*.json') { + Remove-Item -LiteralPath $file.FullName + } + foreach ($file in Get-ChildItem -LiteralPath $minecraftAdvancementRoot -Filter '*.json' -Recurse) { + Remove-Item -LiteralPath $file.FullName + } +} + +function Write-TargetTags() { + foreach ($family in $families) { + foreach ($finish in @('', 'brick', 'smooth', 'smooth_brick')) { + $suffix = if ($finish) { "_$finish" } else { '' } + $pathSuffix = if ($finish) { "/$finish" } else { '' } + foreach ($kind in @('stones', 'slabs')) { + $item = if ($kind -eq 'slabs') { + "mineralogy:${family}${suffix}_slab" + } + else { + "mineralogy:${family}${suffix}" + } + $destination = Join-Path $itemTagRoot "$kind\$family$pathSuffix.json" + New-Item -ItemType Directory -Force -Path (Split-Path -Parent $destination) | Out-Null + $values = @($item) + $values += @(NativeTagAliases $kind $family $finish) + Write-Json $destination ([ordered]@{ replace = $false; values = $values }) + } + } + + $blockDestination = Join-Path $blockTagRoot "stones\$family.json" + New-Item -ItemType Directory -Force -Path (Split-Path -Parent $blockDestination) | Out-Null + $blockValues = @("mineralogy:$family") + $blockValues += @(NativeTagAliases 'stones' $family '') + Write-Json $blockDestination ([ordered]@{ replace = $false; values = $blockValues }) + } +} + +function Write-CobblestoneRecipeTags() { + $familyTags = @($families | ForEach-Object { "#mineralogy:stones/$_" }) + Write-Json (Join-Path $itemTagRoot 'cobblestone_equivalents.json') ([ordered]@{ + replace = $false + values = @('#forge:cobblestone') + $familyTags + }) + Write-Json (Join-Path $itemTagRoot 'stone_crafting_materials.json') ([ordered]@{ + replace = $false + values = @('#minecraft:stone_crafting_materials') + $familyTags + }) + Write-Json (Join-Path $itemTagRoot 'stone_tool_materials.json') ([ordered]@{ + replace = $false + values = @('#minecraft:stone_tool_materials') + $familyTags + }) +} + +function VanillaRecipeAdvancement( + [string] $recipeName, + [string] $criterionName, + [System.Collections.IDictionary] $criterionIngredient +) { + return [ordered]@{ + parent = 'minecraft:recipes/root' + rewards = [ordered]@{ recipes = @("minecraft:$recipeName") } + criteria = [ordered]@{ + $criterionName = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ items = @((AdvancementPredicate $criterionIngredient)) } + } + has_the_recipe = [ordered]@{ + trigger = 'minecraft:recipe_unlocked' + conditions = [ordered]@{ recipe = "minecraft:$recipeName" } + } + } + requirements = ,@($criterionName, 'has_the_recipe') + } +} + +function Write-ConditionalMinecraftAdvancement( + [string] $category, + [string] $recipeName, + [System.Collections.IDictionary] $condition, + [string] $criterionName, + [System.Collections.IDictionary] $enabledIngredient, + [System.Collections.IDictionary] $fallbackIngredient +) { + $directory = Join-Path $minecraftAdvancementRoot $category + 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 + } + ) + }) +} + +function Write-CobblestoneRecipeOverrides() { + $condition = ConfigCondition 'COBBLESTONE_EQUIVILENT' + $enabledCobblestone = [ordered]@{ tag = 'mineralogy:cobblestone_equivalents' } + $fallbackCobblestone = [ordered]@{ tag = 'forge:cobblestone' } + $enabledCrafting = [ordered]@{ tag = 'mineralogy:stone_crafting_materials' } + $fallbackCrafting = [ordered]@{ tag = 'minecraft:stone_crafting_materials' } + $enabledTools = [ordered]@{ tag = 'mineralogy:stone_tool_materials' } + $fallbackTools = [ordered]@{ tag = 'minecraft:stone_tool_materials' } + + Write-ConditionalMinecraftRecipe 'furnace' $condition ` + (VanillaShapedRecipe @('###', '# #', '###') ([ordered]@{ '#' = $enabledCrafting }) 'minecraft:furnace') ` + (VanillaShapedRecipe @('###', '# #', '###') ([ordered]@{ '#' = $fallbackCrafting }) 'minecraft:furnace') + Write-ConditionalMinecraftRecipe 'brewing_stand' $condition ` + (VanillaShapedRecipe @(' B ', '###') ([ordered]@{ + B = ItemIngredient 'minecraft:blaze_rod'; '#' = $enabledCrafting + }) 'minecraft:brewing_stand') ` + (VanillaShapedRecipe @(' B ', '###') ([ordered]@{ + B = ItemIngredient 'minecraft:blaze_rod'; '#' = $fallbackCrafting + }) 'minecraft:brewing_stand') + Write-ConditionalMinecraftRecipe 'lever' $condition ` + (VanillaShapedRecipe @('X', '#') ([ordered]@{ + '#' = $enabledCobblestone; X = ItemIngredient 'minecraft:stick' + }) 'minecraft:lever') ` + (VanillaShapedRecipe @('X', '#') ([ordered]@{ + '#' = $fallbackCobblestone; X = ItemIngredient 'minecraft:stick' + }) 'minecraft:lever') + Write-ConditionalMinecraftRecipe 'piston' $condition ` + (VanillaShapedRecipe @('TTT', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $enabledCobblestone + T = [ordered]@{ tag = 'minecraft:planks' }; X = ItemIngredient 'minecraft:iron_ingot' + }) 'minecraft:piston') ` + (VanillaShapedRecipe @('TTT', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $fallbackCobblestone + T = [ordered]@{ tag = 'minecraft:planks' }; X = ItemIngredient 'minecraft:iron_ingot' + }) 'minecraft:piston') + Write-ConditionalMinecraftRecipe 'dispenser' $condition ` + (VanillaShapedRecipe @('###', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $enabledCobblestone + X = ItemIngredient 'minecraft:bow' + }) 'minecraft:dispenser') ` + (VanillaShapedRecipe @('###', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $fallbackCobblestone + X = ItemIngredient 'minecraft:bow' + }) 'minecraft:dispenser') + Write-ConditionalMinecraftRecipe 'dropper' $condition ` + (VanillaShapedRecipe @('###', '# #', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $enabledCobblestone + }) 'minecraft:dropper') ` + (VanillaShapedRecipe @('###', '# #', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $fallbackCobblestone + }) 'minecraft:dropper') + Write-ConditionalMinecraftRecipe 'observer' $condition ` + (VanillaShapedRecipe @('###', 'RRQ', '###') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; R = ItemIngredient 'minecraft:redstone' + '#' = $enabledCobblestone + }) 'minecraft:observer') ` + (VanillaShapedRecipe @('###', 'RRQ', '###') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; R = ItemIngredient 'minecraft:redstone' + '#' = $fallbackCobblestone + }) 'minecraft:observer') + Write-ConditionalMinecraftRecipe 'mossy_cobblestone_from_vine' $condition ` + (VanillaShapelessRecipe @($enabledCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') ` + (VanillaShapelessRecipe @($fallbackCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') + Write-ConditionalMinecraftRecipe 'mossy_cobblestone_from_moss_block' $condition ` + (VanillaShapelessRecipe @($enabledCobblestone, (ItemIngredient 'minecraft:moss_block')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') ` + (VanillaShapelessRecipe @($fallbackCobblestone, (ItemIngredient 'minecraft:moss_block')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') + Write-ConditionalMinecraftRecipe 'andesite' $condition ` + (VanillaShapelessRecipe @((ItemIngredient 'minecraft:diorite'), $enabledCobblestone) 'minecraft:andesite' 2) ` + (VanillaShapelessRecipe @((ItemIngredient 'minecraft:diorite'), $fallbackCobblestone) 'minecraft:andesite' 2) + Write-ConditionalMinecraftRecipe 'diorite' $condition ` + (VanillaShapedRecipe @('CQ', 'QC') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; C = $enabledCobblestone + }) 'minecraft:diorite' 2) ` + (VanillaShapedRecipe @('CQ', 'QC') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; C = $fallbackCobblestone + }) 'minecraft:diorite' 2) + + $toolRecipes = [ordered]@{ + stone_axe = @('XX', 'X#', ' #') + stone_hoe = @('XX', ' #', ' #') + stone_pickaxe = @('XXX', ' # ', ' # ') + stone_shovel = @('X', '#', '#') + stone_sword = @('X', 'X', '#') + } + foreach ($recipeName in $toolRecipes.Keys) { + Write-ConditionalMinecraftRecipe $recipeName $condition ` + (VanillaShapedRecipe $toolRecipes[$recipeName] ([ordered]@{ + '#' = ItemIngredient 'minecraft:stick'; X = $enabledTools + }) "minecraft:$recipeName") ` + (VanillaShapedRecipe $toolRecipes[$recipeName] ([ordered]@{ + '#' = ItemIngredient 'minecraft:stick'; X = $fallbackTools + }) "minecraft:$recipeName") + } + + $advancements = @( + @('decorations', 'furnace', 'has_cobblestone', $enabledCrafting, $fallbackCrafting), + @('brewing', 'brewing_stand', 'has_blaze_rod', (ItemIngredient 'minecraft:blaze_rod'), (ItemIngredient 'minecraft:blaze_rod')), + @('redstone', 'lever', 'has_cobblestone', $enabledCobblestone, $fallbackCobblestone), + @('redstone', 'piston', 'has_redstone', (ItemIngredient 'minecraft:redstone'), (ItemIngredient 'minecraft:redstone')), + @('redstone', 'dispenser', 'has_bow', (ItemIngredient 'minecraft:bow'), (ItemIngredient 'minecraft:bow')), + @('redstone', 'dropper', 'has_redstone', (ItemIngredient 'minecraft:redstone'), (ItemIngredient 'minecraft:redstone')), + @('redstone', 'observer', 'has_quartz', (ItemIngredient 'minecraft:quartz'), (ItemIngredient 'minecraft:quartz')), + @('building_blocks', 'mossy_cobblestone_from_vine', 'has_vine', (ItemIngredient 'minecraft:vine'), (ItemIngredient 'minecraft:vine')), + @('building_blocks', 'mossy_cobblestone_from_moss_block', 'has_moss_block', (ItemIngredient 'minecraft:moss_block'), (ItemIngredient 'minecraft:moss_block')), + @('building_blocks', 'andesite', 'has_stone', (ItemIngredient 'minecraft:diorite'), (ItemIngredient 'minecraft:diorite')), + @('building_blocks', 'diorite', 'has_quartz', (ItemIngredient 'minecraft:quartz'), (ItemIngredient 'minecraft:quartz')), + @('tools', 'stone_axe', 'has_cobblestone', $enabledTools, $fallbackTools), + @('tools', 'stone_hoe', 'has_cobblestone', $enabledTools, $fallbackTools), + @('tools', 'stone_pickaxe', 'has_cobblestone', $enabledTools, $fallbackTools), + @('tools', 'stone_shovel', 'has_cobblestone', $enabledTools, $fallbackTools), + @('combat', 'stone_sword', 'has_cobblestone', $enabledTools, $fallbackTools) + ) + foreach ($entry in $advancements) { + Write-ConditionalMinecraftAdvancement $entry[0] $entry[1] $condition $entry[2] $entry[3] $entry[4] + } +} + +function Write-NativeSlabOverrides() { + foreach ($family in @('andesite', 'diorite', 'granite')) { + $raw = $nativeFullBlocks[$family].raw + $smooth = $nativeFullBlocks[$family].smooth + foreach ($finish in @( + @{ recipe = "${family}_slab"; source = $raw; mineralogy = "mineralogy:${family}_slab"; vanilla = "minecraft:${family}_slab" }, + @{ recipe = "polished_${family}_slab"; source = $smooth; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" } + )) { + $condition = ItemCondition $finish.mineralogy + Write-ConditionalMinecraftRecipe $finish.recipe $condition ` + (VanillaShapedRecipe @('###') ([ordered]@{ '#' = ItemIngredient $finish.source }) $finish.mineralogy 6) ` + (VanillaShapedRecipe @('###') ([ordered]@{ '#' = ItemIngredient $finish.source }) $finish.vanilla 6) + } + + foreach ($route in @( + @{ recipe = "${family}_slab_from_${family}_stonecutting"; source = $raw; mineralogy = "mineralogy:${family}_slab"; vanilla = "minecraft:${family}_slab" }, + @{ recipe = "polished_${family}_slab_from_${family}_stonecutting"; source = $raw; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" }, + @{ recipe = "polished_${family}_slab_from_polished_${family}_stonecutting"; source = $smooth; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" } + )) { + $condition = ItemCondition $route.mineralogy + Write-ConditionalMinecraftRecipe $route.recipe $condition ` + (VanillaStonecuttingRecipe (ItemIngredient $route.source) $route.mineralogy 2) ` + (VanillaStonecuttingRecipe (ItemIngredient $route.source) $route.vanilla 2) + } + } +} + +function Write-NativeSlabConversions() { + foreach ($family in @('andesite', 'diorite', 'granite')) { + foreach ($finish in @( + @{ name = 'raw'; mineralogy = "mineralogy:${family}_slab"; vanilla = "minecraft:${family}_slab" }, + @{ name = 'smooth'; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" } + )) { + $prefix = if ($finish.name -eq 'raw') { "${family}_slab" } else { "${family}_smooth_slab" } + $conditions = @((ItemCondition $finish.mineralogy), (ItemCondition $finish.vanilla)) + + Write-ShapelessRecipe "${prefix}_to_vanilla" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $finish.mineralogy)) $finish.vanilla 1 $conditions + Register-UnlockSource "${prefix}_to_vanilla" $finish.mineralogy + + Write-ShapelessRecipe "${prefix}_from_vanilla" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $finish.vanilla)) $finish.mineralogy 1 $conditions + Register-UnlockSource "${prefix}_from_vanilla" $finish.vanilla + } + } +} + +function Write-NativePolishedOverrides() { + New-Item -ItemType Directory -Force -Path $minecraftRecipeRoot | Out-Null + $minecraftBuildingAdvancementRoot = Join-Path $minecraftAdvancementRoot 'building_blocks' + New-Item -ItemType Directory -Force -Path $minecraftBuildingAdvancementRoot | Out-Null + foreach ($family in @($nativeFullBlocks.Keys | Where-Object { $nativeFullBlocks[$_].ContainsKey('smooth') })) { + $raw = $nativeFullBlocks[$family].raw + $smooth = $nativeFullBlocks[$family].smooth + $recipeName = "polished_$family" + Write-Json (Join-Path $minecraftRecipeRoot "$recipeName.json") ([ordered]@{ + type = 'minecraft:crafting_shapeless' + ingredients = @((ItemIngredient $raw), (ItemIngredient 'minecraft:sand')) + result = RecipeResult $smooth 1 + }) + Write-Json (Join-Path $minecraftBuildingAdvancementRoot "$recipeName.json") ([ordered]@{ + parent = 'minecraft:recipes/root' + rewards = [ordered]@{ recipes = @("minecraft:$recipeName") } + criteria = [ordered]@{ + has_rock = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ items = @((AdvancementPredicate (ItemIngredient $raw))) } + } + has_sand = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ items = @((AdvancementPredicate (ItemIngredient 'minecraft:sand'))) } + } + has_the_recipe = [ordered]@{ + trigger = 'minecraft:recipe_unlocked' + conditions = [ordered]@{ recipe = "minecraft:$recipeName" } + } + } + requirements = @( + @('has_the_recipe', 'has_rock'), + @('has_the_recipe', 'has_sand') + ) + }) + } +} + +Prepare-TargetDirectories +Write-TargetTags +Write-CobblestoneRecipeTags +Write-CobblestoneRecipeOverrides +Write-NativeSlabOverrides +Write-NativePolishedOverrides +New-Item -ItemType Directory -Force -Path $recipeRoot | Out-Null + +foreach ($family in $families) { + Write-BaseFamilyRecipes $family + Write-ReliefRecipes $family + Write-ConstructionRecipes $family +} +Write-NativeSlabConversions +Write-GlobalRecipes + +$expectedRecipeCount = ($families.Count * 50) + 49 +if ($generatedNames.Count -ne $expectedRecipeCount) { + throw "Expected $expectedRecipeCount generated recipes, produced $($generatedNames.Count)" +} + +$expectedTargetRecipeCount = $expectedRecipeCount + 28 +$recipeFiles = Get-ChildItem -LiteralPath $recipeRoot -Filter '*.json' | + Where-Object { -not $_.Name.StartsWith('_') } +if ($recipeFiles.Count -ne $expectedTargetRecipeCount) { + throw "Expected $expectedTargetRecipeCount target recipe files, found $($recipeFiles.Count)" +} + +$createdAdvancements = Ensure-MissingRecipeAdvancements +$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 recipe advancements." diff --git a/settings.gradle b/settings.gradle index 0077fa746..3f117d996 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,5 +9,5 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } diff --git a/src/main/java/zone/moddev/mc/mineralogy/ContentPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/ContentPolicy.java new file mode 100644 index 000000000..1a59e49aa --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/ContentPolicy.java @@ -0,0 +1,27 @@ +package zone.moddev.mc.mineralogy; + +/** Visibility and recipe policy for compatibility-safe optional content. */ +public final class ContentPolicy { + public static final String ENABLE_DRYWALLS = "ENABLE_DRYWALLS"; + public static final String ENABLE_ROCK_SALT_LAMPS = "ENABLE_ROCK_SALT_LAMPS"; + public static final String ENABLE_MINERAL_DUSTS = "ENABLE_MINERAL_DUSTS"; + public static final String ENABLE_MINERAL_FERTILIZER = "ENABLE_MINERAL_FERTILIZER"; + + private final boolean drywalls; + private final boolean lamps; + private final boolean dusts; + private final boolean fertilizer; + + public ContentPolicy(boolean drywalls, boolean lamps, boolean dusts, boolean fertilizer) { + this.drywalls = drywalls; + this.lamps = lamps; + this.dusts = dusts; + this.fertilizer = fertilizer; + } + + public static ContentPolicy defaults() { return new ContentPolicy(true, true, true, true); } + public boolean drywallsEnabled() { return drywalls; } + public boolean rockSaltLampsEnabled() { return lamps; } + public boolean mineralDustsEnabled() { return dusts; } + public boolean mineralFertilizerEnabled() { return fertilizer; } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java new file mode 100644 index 000000000..adb736464 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java @@ -0,0 +1,24 @@ +package zone.moddev.mc.mineralogy; + +import zone.moddev.mc.mineralogy.blocks.Ore; +import zone.moddev.mc.mineralogy.blocks.Rock; +import zone.moddev.mc.mineralogy.blocks.RockRelief; +import zone.moddev.mc.mineralogy.blocks.RockSlab; +import zone.moddev.mc.mineralogy.blocks.RockStairs; +import zone.moddev.mc.mineralogy.blocks.RockWall; + +/** Target-native five-way creative classification. */ +public final class CreativeTabPolicy { + public enum ContentGroup { ROCK, STAIR, SLAB, WALL, ITEM } + private final boolean grouped; + public CreativeTabPolicy(boolean grouped) { this.grouped = grouped; } + public boolean groupTabsByType() { return grouped; } + public ContentGroup groupFor(Class type) { + if (RockRelief.class.isAssignableFrom(type)) return ContentGroup.ITEM; + if (RockStairs.class.isAssignableFrom(type)) return ContentGroup.STAIR; + if (RockSlab.class.isAssignableFrom(type)) return ContentGroup.SLAB; + if (RockWall.class.isAssignableFrom(type)) return ContentGroup.WALL; + if (Rock.class.isAssignableFrom(type) || Ore.class.isAssignableFrom(type)) return ContentGroup.ROCK; + return ContentGroup.ITEM; + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java b/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java index 29b494082..f3f55716f 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java +++ b/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java @@ -1,14 +1,20 @@ package zone.moddev.mc.mineralogy; +import zone.moddev.mc.mineralogy.compat.CobblestoneTagPolicy; import zone.moddev.mc.mineralogy.documentation.DocumentationExporter; import zone.moddev.mc.mineralogy.init.MineralogyFluids; +import zone.moddev.mc.mineralogy.migration.LegacyMineralogy6ConfigMigrator; +import zone.moddev.mc.mineralogy.migration.LegacyOreConfigMigrator; import zone.moddev.mc.mineralogy.patching.LegacyWorldDataHook; - import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + @Mod(Mineralogy.MODID) public class Mineralogy { public static Mineralogy instance; @@ -17,6 +23,8 @@ public class Mineralogy { public static final String NAME = "Mineralogy"; public static final String VERSION = getVersion(); + public static final Logger LOGGER = LogManager.getLogger(); + private static String getVersion() { Package metadata = Mineralogy.class.getPackage(); String version = metadata == null ? null : metadata.getImplementationVersion(); @@ -25,16 +33,21 @@ private static String getVersion() { public Mineralogy() { instance = this; - MineralogyConfig.register(); + MineralogyConfig.load(); + LegacyMineralogy6ConfigMigrator.migrateGlobalConfig( + MineralogyConfig.configFile().toAbsolutePath().getParent(), LOGGER); + LegacyOreConfigMigrator.migrate(MineralogyConfig.configFile(), LOGGER); MineralogyConfig.registerRecipeConditions(); MineralogyConfig.registerAdvancementPredicates(); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); MineralogyFluids.register(FMLJavaModLoadingContext.get().getModEventBus()); - MinecraftForge.EVENT_BUS.addListener(LegacyWorldDataHook::onServerAboutToStart); + MinecraftForge.EVENT_BUS.addListener(EventPriority.HIGHEST, + LegacyWorldDataHook::onServerAboutToStart); + MinecraftForge.EVENT_BUS.addListener(CobblestoneTagPolicy::onTagsUpdated); } private void setup(final FMLCommonSetupEvent event) { - MineralogyConfig.bake(); event.enqueueWork(DocumentationExporter::exportBundledGuide); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java index 70609b9a7..c35ed5e1c 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java +++ b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java @@ -1,7 +1,17 @@ package zone.moddev.mc.mineralogy; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.AtomicMoveNotSupportedException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.function.BooleanSupplier; import com.google.gson.JsonArray; @@ -10,322 +20,355 @@ import com.google.gson.JsonSyntaxException; import net.minecraft.advancements.critereon.ItemPredicate; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.GsonHelper; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.common.ForgeConfigSpec; +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.fml.ModLoadingContext; -import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.registries.ForgeRegistries; -/** Mineralogy content settings. OreSpawn owns all terrain and deposit settings. */ +/** + * Content-only Mineralogy configuration. + * + *

Existing Mineralogy 5 TOML files are read without being rewritten because + * OreSpawn uses their retired geology and ore values during world migration.

+ */ public final class MineralogyConfig { - public static final ForgeConfigSpec SPEC; - - private static final ForgeConfigSpec.BooleanValue SMELTABLE_GRAVEL; - private static final ForgeConfigSpec.BooleanValue DROP_COBBLESTONE; - private static final ForgeConfigSpec.BooleanValue PATCH_UPDATE; - private static final ForgeConfigSpec.BooleanValue COBBLESTONE_EQUIVILENT; - private static final ForgeConfigSpec.BooleanValue GENERATE_RELIEFS; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKWALL; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICK; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKWALL; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTH; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHWALL; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICK; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKWALL; - private static final ForgeConfigSpec.BooleanValue GROUP_TABS_BY_TYPE; - - private static boolean smeltableGravel = true; - private static boolean dropCobblestone; - private static boolean patchUpdate = true; - private static boolean makeRockCobblestoneEquivilent = true; - private static boolean generateReliefs = true; - private static boolean generateRockStairs = true; - private static boolean generateRockFurnace = true; - private static boolean generateRockSlab = true; - private static boolean generateRockWall = true; - private static boolean generateBrick = true; - private static boolean generateBrickFurnace = true; - private static boolean generateBrickStairs = true; - private static boolean generateBrickSlab = true; - private static boolean generateBrickWall = true; - private static boolean generateSmooth = true; - private static boolean generateSmoothFurnace = true; - private static boolean generateSmoothStairs = true; - private static boolean generateSmoothSlab = true; - private static boolean generateSmoothWall = true; - private static boolean generateSmoothBrick = true; - private static boolean generateSmoothBrickFurnace = true; - private static boolean generateSmoothBrickStairs = true; - private static boolean generateSmoothBrickSlab = true; - private static boolean generateSmoothBrickWall = true; - private static boolean groupCreativeTabItemsByType; - private static boolean recipeConditionsRegistered; - private static boolean advancementPredicatesRegistered; - - private static final ResourceLocation CONFIG_CONDITION_ID = - new ResourceLocation(Mineralogy.MODID, "config"); - - static { - ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); - builder.push("options"); - PATCH_UPDATE = builder - .comment("Allow compatibility patching for worlds created by older Mineralogy versions.") - .define("patch_world", patchUpdate); - SMELTABLE_GRAVEL = builder - .comment("Allow gravel to be smelted into generic stone. Recipe changes require a restart.") - .define("SMELTABLE_GRAVEL", smeltableGravel); - DROP_COBBLESTONE = builder - .comment("Make ordinary rock blocks also drop cobblestone.") - .define("DROP_COBBLESTONE", dropCobblestone); - COBBLESTONE_EQUIVILENT = builder - .comment("Treat rock blocks as cobblestone equivalents where supported.") - .define("COBBLESTONE_EQUIVILENT", makeRockCobblestoneEquivilent); - GENERATE_RELIEFS = flag(builder, "GENERATE_RELIEFS", "Register rock reliefs.", generateReliefs); - GENERATE_ROCKSTAIRS = flag(builder, "GENERATE_ROCKSTAIRS", "Register rock stairs.", generateRockStairs); - GENERATE_ROCKFURNACE = flag(builder, "GENERATE_ROCKFURNACE", "Register rock furnaces.", generateRockFurnace); - GENERATE_ROCKSLAB = flag(builder, "GENERATE_ROCKSLAB", "Register rock slabs.", generateRockSlab); - GENERATE_ROCKWALL = flag(builder, "GENERATE_ROCKWALL", "Register rock walls.", generateRockWall); - GENERATE_BRICK = flag(builder, "GENERATE_BRICK", "Register rock bricks.", generateBrick); - GENERATE_BRICKFURNACE = flag(builder, "GENERATE_BRICKFURNACE", "Register brick furnaces.", generateBrickFurnace); - GENERATE_BRICKSTAIRS = flag(builder, "GENERATE_BRICKSTAIRS", "Register brick stairs.", generateBrickStairs); - GENERATE_BRICKSLAB = flag(builder, "GENERATE_BRICKSLAB", "Register brick slabs.", generateBrickSlab); - GENERATE_BRICKWALL = flag(builder, "GENERATE_BRICKWALL", "Register brick walls.", generateBrickWall); - GENERATE_SMOOTH = flag(builder, "GENERATE_SMOOTH", "Register polished rock.", generateSmooth); - GENERATE_SMOOTHFURNACE = flag(builder, "GENERATE_SMOOTHFURNACE", "Register polished furnaces.", generateSmoothFurnace); - GENERATE_SMOOTHSTAIRS = flag(builder, "GENERATE_SMOOTHSTAIRS", "Register polished stairs.", generateSmoothStairs); - GENERATE_SMOOTHSLAB = flag(builder, "GENERATE_SMOOTHSLAB", "Register polished slabs.", generateSmoothSlab); - GENERATE_SMOOTHWALL = flag(builder, "GENERATE_SMOOTHWALL", "Register polished walls.", generateSmoothWall); - GENERATE_SMOOTHBRICK = flag(builder, "GENERATE_SMOOTHBRICK", "Register polished bricks.", generateSmoothBrick); - GENERATE_SMOOTHBRICKFURNACE = flag(builder, "GENERATE_SMOOTHBRICKFURNACE", "Register polished brick furnaces.", generateSmoothBrickFurnace); - GENERATE_SMOOTHBRICKSTAIRS = flag(builder, "GENERATE_SMOOTHBRICKSTAIRS", "Register polished brick stairs.", generateSmoothBrickStairs); - GENERATE_SMOOTHBRICKSLAB = flag(builder, "GENERATE_SMOOTHBRICKSLAB", "Register polished brick slabs.", generateSmoothBrickSlab); - GENERATE_SMOOTHBRICKWALL = flag(builder, "GENERATE_SMOOTHBRICKWALL", "Register polished brick walls.", generateSmoothBrickWall); - GROUP_TABS_BY_TYPE = builder - .comment("Split creative tabs by item type where supported.") - .define("GROUP_TABS_BY_TYPE", groupCreativeTabItemsByType); - builder.pop(); - SPEC = builder.build(); - } - - private MineralogyConfig() { - throw new IllegalAccessError("Not an instantiable class"); - } - - private static ForgeConfigSpec.BooleanValue flag(ForgeConfigSpec.Builder builder, - String key, String comment, boolean value) { - return builder.comment(comment).define(key, value); - } - - public static void register() { - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, SPEC, - Mineralogy.MODID + "-common.toml"); - } - - public static void registerRecipeConditions() { - if (!recipeConditionsRegistered) { - CraftingHelper.register(new ConfigConditionSerializer()); - recipeConditionsRegistered = true; - } - } - - public static void registerAdvancementPredicates() { - if (!advancementPredicatesRegistered) { - ItemPredicate.register(new ResourceLocation(Mineralogy.MODID, "config_item"), - MineralogyConfig::configItemPredicate); - advancementPredicatesRegistered = true; - } - } - - public static void bake() { - smeltableGravel = SMELTABLE_GRAVEL.get(); - dropCobblestone = DROP_COBBLESTONE.get(); - patchUpdate = PATCH_UPDATE.get(); - makeRockCobblestoneEquivilent = COBBLESTONE_EQUIVILENT.get(); - generateReliefs = GENERATE_RELIEFS.get(); - generateRockStairs = GENERATE_ROCKSTAIRS.get(); - generateRockFurnace = GENERATE_ROCKFURNACE.get(); - generateRockSlab = GENERATE_ROCKSLAB.get(); - generateRockWall = GENERATE_ROCKWALL.get(); - generateBrick = GENERATE_BRICK.get(); - generateBrickFurnace = GENERATE_BRICKFURNACE.get(); - generateBrickStairs = GENERATE_BRICKSTAIRS.get(); - generateBrickSlab = GENERATE_BRICKSLAB.get(); - generateBrickWall = GENERATE_BRICKWALL.get(); - generateSmooth = GENERATE_SMOOTH.get(); - generateSmoothFurnace = GENERATE_SMOOTHFURNACE.get(); - generateSmoothStairs = GENERATE_SMOOTHSTAIRS.get(); - generateSmoothSlab = GENERATE_SMOOTHSLAB.get(); - generateSmoothWall = GENERATE_SMOOTHWALL.get(); - generateSmoothBrick = GENERATE_SMOOTHBRICK.get(); - generateSmoothBrickFurnace = GENERATE_SMOOTHBRICKFURNACE.get(); - generateSmoothBrickStairs = GENERATE_SMOOTHBRICKSTAIRS.get(); - generateSmoothBrickSlab = GENERATE_SMOOTHBRICKSLAB.get(); - generateSmoothBrickWall = GENERATE_SMOOTHBRICKWALL.get(); - groupCreativeTabItemsByType = GROUP_TABS_BY_TYPE.get(); - } - - private static ItemPredicate configItemPredicate(JsonObject json) { - List flags = new ArrayList<>(); - if (json.has("flags")) { - JsonArray flagArray = GsonHelper.getAsJsonArray(json, "flags"); - for (JsonElement flag : flagArray) { - 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 name) { - switch (name) { - case "SMELTABLE_GRAVEL": return configFlag(() -> smeltableGravel); - case "GENERATE_RELIEFS": return configFlag(() -> generateReliefs); - case "GENERATE_ROCKSTAIRS": return configFlag(() -> generateRockStairs); - case "GENERATE_ROCKFURNACE": return configFlag(() -> generateRockFurnace); - case "GENERATE_ROCKSLAB": return configFlag(() -> generateRockSlab); - case "GENERATE_ROCKWALL": return configFlag(() -> generateRockWall); - case "GENERATE_BRICK": return configFlag(() -> generateBrick); - case "GENERATE_BRICKFURNACE": return configFlag(() -> generateBrickFurnace); - case "GENERATE_BRICKSTAIRS": return configFlag(() -> generateBrickStairs); - case "GENERATE_BRICKSLAB": return configFlag(() -> generateBrickSlab); - case "GENERATE_BRICKWALL": return configFlag(() -> generateBrickWall); - case "GENERATE_SMOOTH": return configFlag(() -> generateSmooth); - case "GENERATE_SMOOTHFURNACE": return configFlag(() -> generateSmoothFurnace); - case "GENERATE_SMOOTHSTAIRS": return configFlag(() -> generateSmoothStairs); - case "GENERATE_SMOOTHSLAB": return configFlag(() -> generateSmoothSlab); - case "GENERATE_SMOOTHWALL": return configFlag(() -> generateSmoothWall); - case "GENERATE_SMOOTHBRICK": return configFlag(() -> generateSmoothBrick); - case "GENERATE_SMOOTHBRICKFURNACE": return configFlag(() -> generateSmoothBrickFurnace); - case "GENERATE_SMOOTHBRICKSTAIRS": return configFlag(() -> generateSmoothBrickStairs); - case "GENERATE_SMOOTHBRICKSLAB": return configFlag(() -> generateSmoothBrickSlab); - case "GENERATE_SMOOTHBRICKWALL": return configFlag(() -> generateSmoothBrickWall); - default: throw new JsonSyntaxException("Unknown Mineralogy recipe config flag: " + name); - } - } - - private static BooleanSupplier configFlag(BooleanSupplier flag) { - return () -> { - bakeIfConfigured(); - return flag.getAsBoolean(); - }; - } - - private static void bakeIfConfigured() { - try { - bake(); - } catch (NullPointerException e) { - if (!isEarlyConfigAccess(e)) throw e; - } - } - - private static boolean isEarlyConfigAccess(NullPointerException e) { - for (StackTraceElement element : e.getStackTrace()) { - if ("net.minecraftforge.common.ForgeConfigSpec$ConfigValue".equals(element.getClassName()) - && "get".equals(element.getMethodName())) return true; - } - return false; - } - - public static boolean smeltableGravel() { return smeltableGravel; } - public static boolean dropCobblestone() { return dropCobblestone; } - public static boolean makeRockCobblestoneEquivilent() { return makeRockCobblestoneEquivilent; } - public static boolean generateRockFurnace() { return generateRockFurnace; } - public static boolean generateRockStairs() { return generateRockStairs; } - public static boolean generateReliefs() { return generateReliefs; } - public static boolean generateRockSlab() { return generateRockSlab; } - public static boolean generateRockWall() { return generateRockWall; } - public static boolean generateBrick() { return generateBrick; } - public static boolean generateBrickFurnace() { return generateBrickFurnace; } - public static boolean generateBrickStairs() { return generateBrickStairs; } - public static boolean generateBrickSlab() { return generateBrickSlab; } - public static boolean generateBrickWall() { return generateBrickWall; } - public static boolean generateSmooth() { return generateSmooth; } - public static boolean generateSmoothFurnace() { return generateSmoothFurnace; } - public static boolean generateSmoothStairs() { return generateSmoothStairs; } - public static boolean generateSmoothSlab() { return generateSmoothSlab; } - public static boolean generateSmoothWall() { return generateSmoothWall; } - public static boolean generateSmoothBrick() { return generateSmoothBrick; } - public static boolean generateSmoothBrickFurnace() { return generateSmoothBrickFurnace; } - public static boolean generateSmoothBrickStairs() { return generateSmoothBrickStairs; } - public static boolean generateSmoothBrickSlab() { return generateSmoothBrickSlab; } - public static boolean generateSmoothBrickWall() { return generateSmoothBrickWall; } - - public static boolean patchUpdate() { - try { - patchUpdate = PATCH_UPDATE.get(); - } catch (NullPointerException e) { - if (!isEarlyConfigAccess(e)) throw e; - } - return patchUpdate; - } - - public static boolean groupCreativeTabItemsByType() { - try { - groupCreativeTabItemsByType = GROUP_TABS_BY_TYPE.get(); - } catch (NullPointerException e) { - if (!isEarlyConfigAccess(e)) throw e; - } - return groupCreativeTabItemsByType; - } - - private static final class ConfigCondition implements ICondition { - private final String flagName; - private final BooleanSupplier flag; - - private ConfigCondition(String flagName) { - this.flagName = flagName; - this.flag = configFlagCondition(flagName); - } - - @Override public ResourceLocation getID() { return CONFIG_CONDITION_ID; } - @Override public boolean test() { 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; - } - } + public static final String FILE_NAME = "mineralogy-common.toml"; + private static final ResourceLocation CONFIG_CONDITION_ID = + new ResourceLocation(Mineralogy.MODID, "config"); + + private static boolean smeltableGravel = true; + private static boolean dropCobblestone; + private static boolean patchUpdate = true; + private static boolean cobblestoneEquivalent = true; + private static boolean generateReliefs = true; + private static boolean generateRockStairs = true; + private static boolean generateRockFurnace = true; + private static boolean generateRockSlab = true; + private static boolean generateRockWall = true; + private static boolean generateBrick = true; + private static boolean generateBrickFurnace = true; + private static boolean generateBrickStairs = true; + private static boolean generateBrickSlab = true; + private static boolean generateBrickWall = true; + private static boolean generateSmooth = true; + private static boolean generateSmoothFurnace = true; + private static boolean generateSmoothStairs = true; + private static boolean generateSmoothSlab = true; + private static boolean generateSmoothWall = true; + private static boolean generateSmoothBrick = true; + private static boolean generateSmoothBrickFurnace = true; + private static boolean generateSmoothBrickStairs = true; + private static boolean generateSmoothBrickSlab = true; + private static boolean generateSmoothBrickWall = true; + private static ContentPolicy contentPolicy = ContentPolicy.defaults(); + private static CreativeTabPolicy creativeTabPolicy = new CreativeTabPolicy(false); + private static Path configFile; + private static boolean recipeConditionsRegistered; + private static boolean advancementPredicatesRegistered; + + private MineralogyConfig() { + } + + public static void load() { + load(FMLPaths.CONFIGDIR.get()); + } + + static void load(Path configDirectory) { + resetDefaults(); + configFile = configDirectory.resolve(FILE_NAME); + boolean existing = Files.isRegularFile(configFile); + Map values = existing ? readToml(configFile) : Collections.emptyMap(); + + patchUpdate = option(values, "patch_world", patchUpdate); + smeltableGravel = option(values, "SMELTABLE_GRAVEL", smeltableGravel); + dropCobblestone = option(values, "DROP_COBBLESTONE", dropCobblestone); + cobblestoneEquivalent = option(values, "COBBLESTONE_EQUIVILENT", cobblestoneEquivalent); + generateReliefs = option(values, "GENERATE_RELIEFS", generateReliefs); + generateRockStairs = option(values, "GENERATE_ROCKSTAIRS", generateRockStairs); + generateRockFurnace = option(values, "GENERATE_ROCKFURNACE", generateRockFurnace); + generateRockSlab = option(values, "GENERATE_ROCKSLAB", generateRockSlab); + generateRockWall = option(values, "GENERATE_ROCKWALL", generateRockWall); + generateBrick = option(values, "GENERATE_BRICK", generateBrick); + generateBrickFurnace = option(values, "GENERATE_BRICKFURNACE", generateBrickFurnace); + generateBrickStairs = option(values, "GENERATE_BRICKSTAIRS", generateBrickStairs); + generateBrickSlab = option(values, "GENERATE_BRICKSLAB", generateBrickSlab); + generateBrickWall = option(values, "GENERATE_BRICKWALL", generateBrickWall); + generateSmooth = option(values, "GENERATE_SMOOTH", generateSmooth); + generateSmoothFurnace = option(values, "GENERATE_SMOOTHFURNACE", generateSmoothFurnace); + generateSmoothStairs = option(values, "GENERATE_SMOOTHSTAIRS", generateSmoothStairs); + generateSmoothSlab = option(values, "GENERATE_SMOOTHSLAB", generateSmoothSlab); + generateSmoothWall = option(values, "GENERATE_SMOOTHWALL", generateSmoothWall); + generateSmoothBrick = option(values, "GENERATE_SMOOTHBRICK", generateSmoothBrick); + generateSmoothBrickFurnace = option(values, "GENERATE_SMOOTHBRICKFURNACE", generateSmoothBrickFurnace); + generateSmoothBrickStairs = option(values, "GENERATE_SMOOTHBRICKSTAIRS", generateSmoothBrickStairs); + generateSmoothBrickSlab = option(values, "GENERATE_SMOOTHBRICKSLAB", generateSmoothBrickSlab); + generateSmoothBrickWall = option(values, "GENERATE_SMOOTHBRICKWALL", generateSmoothBrickWall); + + contentPolicy = new ContentPolicy( + option(values, ContentPolicy.ENABLE_DRYWALLS, true), + option(values, ContentPolicy.ENABLE_ROCK_SALT_LAMPS, true), + option(values, ContentPolicy.ENABLE_MINERAL_DUSTS, true), + option(values, ContentPolicy.ENABLE_MINERAL_FERTILIZER, true)); + creativeTabPolicy = new CreativeTabPolicy(option(values, "GROUP_TABS_BY_TYPE", false)); + + if (!existing) writeCleanConfig(configFile); + } + + private static void resetDefaults() { + smeltableGravel = true; + dropCobblestone = false; + patchUpdate = true; + cobblestoneEquivalent = true; + generateReliefs = true; + generateRockStairs = true; + generateRockFurnace = true; + generateRockSlab = true; + generateRockWall = true; + generateBrick = true; + generateBrickFurnace = true; + generateBrickStairs = true; + generateBrickSlab = true; + generateBrickWall = true; + generateSmooth = true; + generateSmoothFurnace = true; + generateSmoothStairs = true; + generateSmoothSlab = true; + generateSmoothWall = true; + generateSmoothBrick = true; + generateSmoothBrickFurnace = true; + generateSmoothBrickStairs = true; + generateSmoothBrickSlab = true; + generateSmoothBrickWall = true; + contentPolicy = ContentPolicy.defaults(); + creativeTabPolicy = new CreativeTabPolicy(false); + } + + private static Map readToml(Path file) { + Map values = new LinkedHashMap<>(); + String section = ""; + try { + for (String raw : Files.readAllLines(file, StandardCharsets.UTF_8)) { + String line = raw.trim(); + if (line.startsWith("[") && line.endsWith("]")) { + section = line.substring(1, line.length() - 1).trim().toLowerCase(Locale.ROOT); + continue; + } + int equals = line.indexOf('='); + if (equals <= 0 || line.startsWith("#")) continue; + String key = line.substring(0, equals).trim().toLowerCase(Locale.ROOT); + values.put(section + "." + key, stripInlineComment(line.substring(equals + 1)).trim()); + } + } catch (IOException e) { + Mineralogy.LOGGER.warn("Could not read {}; using compatibility-safe defaults", file, e); + } + return values; + } + + private static String stripInlineComment(String value) { + boolean quoted = false; + boolean escaped = false; + for (int i = 0; i < value.length(); i++) { + char current = value.charAt(i); + if (current == '"' && !escaped) quoted = !quoted; + if (current == '#' && !quoted) return value.substring(0, i); + escaped = current == '\\' && !escaped; + if (current != '\\') escaped = false; + } + return value; + } + + public static Map readLegacyValues(Path file) { + return Collections.unmodifiableMap(readToml(file)); + } + + private static boolean option(Map values, String name, boolean fallback) { + String text = values.get("options." + name.toLowerCase(Locale.ROOT)); + return text == null ? fallback : Boolean.parseBoolean(text); + } + + private static void writeCleanConfig(Path destination) { + String content = "# Mineralogy 6 content configuration. OreSpawn owns all terrain and ore generation.\n" + + "# Changes require a restart.\n\n[options]\n" + optionLines(); + Path temporary = destination.resolveSibling(destination.getFileName().toString() + ".tmp"); + try { + Files.createDirectories(destination.getParent()); + Files.write(temporary, content.getBytes(StandardCharsets.UTF_8)); + try { + Files.move(temporary, destination, StandardCopyOption.ATOMIC_MOVE); + } catch (AtomicMoveNotSupportedException e) { + Files.move(temporary, destination); + } + } catch (IOException e) { + Mineralogy.LOGGER.warn("Could not create clean Mineralogy configuration {}", destination, e); + try { Files.deleteIfExists(temporary); } catch (IOException ignored) { } + } + } + + private static String optionLines() { + StringBuilder out = new StringBuilder(); + append(out, "patch_world", true); + append(out, "SMELTABLE_GRAVEL", true); + append(out, "DROP_COBBLESTONE", false); + append(out, "COBBLESTONE_EQUIVILENT", true); + append(out, "GROUP_TABS_BY_TYPE", false); + append(out, ContentPolicy.ENABLE_DRYWALLS, true); + append(out, ContentPolicy.ENABLE_ROCK_SALT_LAMPS, true); + append(out, ContentPolicy.ENABLE_MINERAL_DUSTS, true); + append(out, ContentPolicy.ENABLE_MINERAL_FERTILIZER, true); + for (String key : new String[] { "GENERATE_RELIEFS", "GENERATE_ROCKSTAIRS", + "GENERATE_ROCKFURNACE", "GENERATE_ROCKSLAB", "GENERATE_ROCKWALL", + "GENERATE_BRICK", "GENERATE_BRICKFURNACE", "GENERATE_BRICKSTAIRS", + "GENERATE_BRICKSLAB", "GENERATE_BRICKWALL", "GENERATE_SMOOTH", + "GENERATE_SMOOTHFURNACE", "GENERATE_SMOOTHSTAIRS", "GENERATE_SMOOTHSLAB", + "GENERATE_SMOOTHWALL", "GENERATE_SMOOTHBRICK", "GENERATE_SMOOTHBRICKFURNACE", + "GENERATE_SMOOTHBRICKSTAIRS", "GENERATE_SMOOTHBRICKSLAB", + "GENERATE_SMOOTHBRICKWALL" }) append(out, key, true); + return out.toString(); + } + + private static void append(StringBuilder out, String key, boolean value) { + out.append('\t').append(key).append(" = ").append(value).append('\n'); + } + + public static void registerRecipeConditions() { + if (!recipeConditionsRegistered) { + CraftingHelper.register(new ConfigConditionSerializer()); + 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; + case "GENERATE_RELIEFS": return () -> generateReliefs; + case "GENERATE_ROCKSTAIRS": return () -> generateRockStairs; + case "GENERATE_ROCKFURNACE": return () -> generateRockFurnace; + case "GENERATE_ROCKSLAB": return () -> generateRockSlab; + case "GENERATE_ROCKWALL": return () -> generateRockWall; + case "GENERATE_BRICK": return () -> generateBrick; + case "GENERATE_BRICKFURNACE": return () -> generateBrickFurnace; + case "GENERATE_BRICKSTAIRS": return () -> generateBrickStairs; + case "GENERATE_BRICKSLAB": return () -> generateBrickSlab; + case "GENERATE_BRICKWALL": return () -> generateBrickWall; + case "GENERATE_SMOOTH": return () -> generateSmooth; + case "GENERATE_SMOOTHFURNACE": return () -> generateSmoothFurnace; + case "GENERATE_SMOOTHSTAIRS": return () -> generateSmoothStairs; + case "GENERATE_SMOOTHSLAB": return () -> generateSmoothSlab; + case "GENERATE_SMOOTHWALL": return () -> generateSmoothWall; + case "GENERATE_SMOOTHBRICK": return () -> generateSmoothBrick; + case "GENERATE_SMOOTHBRICKFURNACE": return () -> generateSmoothBrickFurnace; + case "GENERATE_SMOOTHBRICKSTAIRS": return () -> generateSmoothBrickStairs; + case "GENERATE_SMOOTHBRICKSLAB": return () -> generateSmoothBrickSlab; + case "GENERATE_SMOOTHBRICKWALL": return () -> generateSmoothBrickWall; + case "COBBLESTONE_EQUIVILENT": return () -> cobblestoneEquivalent; + case ContentPolicy.ENABLE_DRYWALLS: return () -> contentPolicy.drywallsEnabled(); + case ContentPolicy.ENABLE_ROCK_SALT_LAMPS: return () -> contentPolicy.rockSaltLampsEnabled(); + case ContentPolicy.ENABLE_MINERAL_DUSTS: return () -> contentPolicy.mineralDustsEnabled(); + case ContentPolicy.ENABLE_MINERAL_FERTILIZER: return () -> contentPolicy.mineralFertilizerEnabled(); + default: throw new JsonSyntaxException("Unknown Mineralogy recipe config flag: " + flag); + } + } + + public static Path configFile() { return configFile; } + public static boolean smeltableGravel() { return smeltableGravel; } + public static boolean dropCobblestone() { return dropCobblestone; } + public static boolean patchUpdate() { return patchUpdate; } + public static boolean makeRockCobblestoneEquivilent() { return cobblestoneEquivalent; } + public static boolean groupCreativeTabItemsByType() { return creativeTabPolicy.groupTabsByType(); } + public static ContentPolicy contentPolicy() { return contentPolicy; } + public static CreativeTabPolicy creativeTabPolicy() { return creativeTabPolicy; } + public static boolean generateReliefs() { return generateReliefs; } + public static boolean generateRockStairs() { return generateRockStairs; } + public static boolean generateRockFurnace() { return generateRockFurnace; } + public static boolean generateRockSlab() { return generateRockSlab; } + public static boolean generateRockWall() { return generateRockWall; } + public static boolean generateBrick() { return generateBrick; } + public static boolean generateBrickFurnace() { return generateBrickFurnace; } + public static boolean generateBrickStairs() { return generateBrickStairs; } + public static boolean generateBrickSlab() { return generateBrickSlab; } + public static boolean generateBrickWall() { return generateBrickWall; } + public static boolean generateSmooth() { return generateSmooth; } + public static boolean generateSmoothFurnace() { return generateSmoothFurnace; } + public static boolean generateSmoothStairs() { return generateSmoothStairs; } + public static boolean generateSmoothSlab() { return generateSmoothSlab; } + public static boolean generateSmoothWall() { return generateSmoothWall; } + public static boolean generateSmoothBrick() { return generateSmoothBrick; } + public static boolean generateSmoothBrickFurnace() { return generateSmoothBrickFurnace; } + public static boolean generateSmoothBrickStairs() { return generateSmoothBrickStairs; } + public static boolean generateSmoothBrickSlab() { return generateSmoothBrickSlab; } + public static boolean generateSmoothBrickWall() { return generateSmoothBrickWall; } + + public static boolean isCreativeVisible(String name) { + if (name.startsWith("drywall_")) return contentPolicy.drywallsEnabled(); + if ("rocksaltlamp".equals(name) || "rocksaltstreetlamp".equals(name)) return contentPolicy.rockSaltLampsEnabled(); + if ("sulfur_dust".equals(name) || "phosphorous_dust".equals(name) + || "nitrate_dust".equals(name) || "sulfur_block".equals(name) + || "phosphorous_block".equals(name) || "nitrate_block".equals(name)) { + return contentPolicy.mineralDustsEnabled(); + } + return !"mineral_fertilizer".equals(name) || contentPolicy.mineralFertilizerEnabled(); + } + + private static final class ConfigCondition implements ICondition { + private final String flagName; + private final BooleanSupplier flag; + + private ConfigCondition(String flagName) { + this.flagName = flagName; + this.flag = configFlagCondition(flagName); + } + + @Override public ResourceLocation getID() { return CONFIG_CONDITION_ID; } + @Override public boolean test() { 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; + } + } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/RockType.java b/src/main/java/zone/moddev/mc/mineralogy/RockType.java deleted file mode 100644 index fde3d485c..000000000 --- a/src/main/java/zone/moddev/mc/mineralogy/RockType.java +++ /dev/null @@ -1,11 +0,0 @@ -package zone.moddev.mc.mineralogy; - -/** - * Type of rock (e.g. igneous) - * - * @author cybergnome - * - */ -public enum RockType { - SEDIMENTARY, METAMORPHIC, IGNEOUS, ANY -} diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java index 56cd2495f..4975a9245 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java @@ -1,6 +1,6 @@ package zone.moddev.mc.mineralogy.blocks; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Random; @@ -19,12 +19,10 @@ public Chert() { @Override public List getDrops(BlockState state, Builder builder) { - List drops = new ArrayList(super.getDrops(state, builder)); - if (prng.nextInt(10) == 0) { - drops.add(new ItemStack(Items.FLINT, 1 + Math.max(0, getFortuneLevel(builder)))); + return Collections.singletonList( + new ItemStack(Items.FLINT, 1 + Math.max(0, getFortuneLevel(builder)))); } - - return drops; + return super.getDrops(state, builder); } } 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 a5d9673e7..c3b4505d7 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java @@ -9,19 +9,29 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.level.block.state.BlockState; 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.storage.loot.LootContext.Builder; +import net.minecraft.world.level.storage.loot.parameters.LootContextParams; public class DoubleSlab extends Block { private final Block drops; + private final Block fullBlock; private final int toolHardnessLevel; public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, Block drops, String name) { + this(hardness, blastResistance, toolHardnessLevel, sound, drops, drops, name); + } + + public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, Block drops, + Block fullBlock, String name) { super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) .requiresCorrectToolForDrops()); this.drops = drops; + this.fullBlock = fullBlock; this.toolHardnessLevel = toolHardnessLevel; this.setRegistryName(name); } @@ -32,6 +42,11 @@ public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState s } public List getDrops(BlockState state, Builder builder) { + ItemStack tool = builder.getOptionalParameter(LootContextParams.TOOL); + if (tool != null && !tool.isEmpty() + && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) { + return Collections.singletonList(new ItemStack(fullBlock)); + } return Collections.singletonList(new ItemStack(drops, 2)); } } 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 4aa744ea2..a1b7e1685 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java @@ -1,6 +1,6 @@ package zone.moddev.mc.mineralogy.blocks; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.function.Predicate; @@ -41,13 +41,10 @@ public boolean isReplaceableOreGen(BlockState state, LevelReader world, BlockPos } @Override public List getDrops(BlockState state, Builder builder) { - List drops = new ArrayList(super.getDrops(state, builder)); - - if (MineralogyConfig.dropCobblestone()) { - drops.add(new ItemStack(Blocks.COBBLESTONE)); + if (isStoneEquivalent && MineralogyConfig.dropCobblestone()) { + return Collections.singletonList(new ItemStack(Blocks.COBBLESTONE)); } - - return drops; + return super.getDrops(state, builder); } protected static boolean hasSilkTouch(Builder builder) { 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 bc9676cb1..778b8970b 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java @@ -93,11 +93,10 @@ public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { BlockPos supportPos = pos.relative(facing.getOpposite()); BlockState support = world.getBlockState(supportPos); - if (facing == Direction.UP) { - return support.isFaceSturdy(world, supportPos, Direction.UP); - } - if (facing == Direction.DOWN) { - return support.isFaceSturdy(world, supportPos, Direction.DOWN); + if (facing.getAxis().isVertical()) { + // Match vanilla standing-torch support, including fences. The legacy + // lamp accepted canPlaceTorchOnTop blocks in both vertical orientations. + return Block.canSupportCenter(world, supportPos, facing); } return support.isFaceSturdy(world, supportPos, facing); 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 c671430b9..8901d6a2a 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java @@ -13,7 +13,6 @@ public RockStairs(Block materialBlock, float hardness, float blastResistance, in SoundType sound, String name) { super(materialBlock.defaultBlockState(), BlockBehaviour.Properties.of(Material.STONE) .strength(hardness, blastResistance).sound(sound).requiresCorrectToolForDrops()); - this.setRegistryName(name); this.toolHardnessLevel = toolHardnessLevel; } 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 928ea93f6..e31b52d50 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java @@ -17,7 +17,6 @@ public RockWall(Block materialBlock, float hardness, float blastResistance, int SoundType sound, String name) { super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) .requiresCorrectToolForDrops()); - this.setRegistryName(name); this.toolHardnessLevel = toolHardnessLevel; } 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 10b2f5164..195c03e8f 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java @@ -4,6 +4,7 @@ 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; @@ -16,16 +17,18 @@ @Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public final class ClientSetup { - private ClientSetup() { - } + 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); - } - } - } + @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); + } + } + 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 new file mode 100644 index 000000000..3c7497b7d --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java @@ -0,0 +1,118 @@ +package zone.moddev.mc.mineralogy.compat; + +import java.util.ArrayList; +import java.util.IdentityHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraft.core.Holder; +import net.minecraft.core.HolderSet; +import net.minecraft.core.Registry; +import net.minecraft.core.RegistryAccess; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.event.TagsUpdatedEvent; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; +import zone.moddev.mc.mineralogy.data.Material; +import zone.moddev.mc.mineralogy.data.MaterialData; + +/** Applies the legacy cobblestone option to Forge 40 block and item tags. */ +public final class CobblestoneTagPolicy { + private static final ResourceLocation COBBLESTONE = new ResourceLocation("forge", "cobblestone"); + private static final ResourceLocation STONE_CRAFTING_MATERIALS = + new ResourceLocation("minecraft", "stone_crafting_materials"); + private static final ResourceLocation STONE_TOOL_MATERIALS = + new ResourceLocation("minecraft", "stone_tool_materials"); + + private CobblestoneTagPolicy() { + } + + /** Apply after the initial tag load and every server-side data reload. */ + public static void onTagsUpdated(TagsUpdatedEvent event) { + if (event.shouldUpdateStaticData()) { + apply(event.getTagManager()); + } + } + + static void apply(RegistryAccess access) { + Registry blockRegistry = access.registryOrThrow(Registry.BLOCK_REGISTRY); + Registry itemRegistry = access.registryOrThrow(Registry.ITEM_REGISTRY); + Set> configuredBlocks = rawRockHolders(blockRegistry, Registry.BLOCK_REGISTRY); + Set> configuredItems = rawRockHolders(itemRegistry, Registry.ITEM_REGISTRY); + boolean enabled = MineralogyConfig.makeRockCobblestoneEquivilent(); + + Map, List>> blockTags = snapshot(blockRegistry); + updateTag(blockTags, blockRegistry, Registry.BLOCK_REGISTRY, COBBLESTONE, + configuredBlocks, enabled, "chert", "pumice"); + blockRegistry.bindTags(blockTags); + + Map, List>> itemTags = snapshot(itemRegistry); + updateTag(itemTags, itemRegistry, Registry.ITEM_REGISTRY, COBBLESTONE, + configuredItems, enabled, "chert", "pumice"); + updateTag(itemTags, itemRegistry, Registry.ITEM_REGISTRY, STONE_CRAFTING_MATERIALS, + configuredItems, enabled, "chert", "pumice"); + updateTag(itemTags, itemRegistry, Registry.ITEM_REGISTRY, STONE_TOOL_MATERIALS, + configuredItems, enabled, "chert", "pumice"); + itemRegistry.bindTags(itemTags); + + Ingredient.invalidateAll(); + Mineralogy.LOGGER.debug("Applied Forge 40 cobblestone policy: enabled={}, rocks={}, " + + "forgeItems={}, craftingItems={}, toolItems={}", enabled, configuredItems.size(), + size(itemRegistry, Registry.ITEM_REGISTRY, COBBLESTONE), + size(itemRegistry, Registry.ITEM_REGISTRY, STONE_CRAFTING_MATERIALS), + size(itemRegistry, Registry.ITEM_REGISTRY, STONE_TOOL_MATERIALS)); + } + + static Map, List>> snapshot(Registry registry) { + Map, List>> result = new IdentityHashMap<>(); + registry.getTags().forEach(pair -> result.put(pair.getFirst(), holders(pair.getSecond()))); + return result; + } + + private static List> holders(HolderSet.Named values) { + List> result = new ArrayList<>(); + values.forEach(result::add); + return result; + } + + private static Set> rawRockHolders(Registry registry, + ResourceKey> registryKey) { + Set> values = new LinkedHashSet<>(); + for (Material material : MaterialData.allIncludingRockSalt()) { + TagKey tag = TagKey.create(registryKey, + new ResourceLocation(Mineralogy.MODID, "stones/" + material.id())); + registry.getTag(tag).ifPresent(named -> named.forEach(values::add)); + } + return values; + } + + static void updateTag(Map, List>> tags, Registry registry, + ResourceKey> registryKey, ResourceLocation id, + Set> configured, boolean enabled, String... unconditionalNames) { + TagKey key = TagKey.create(registryKey, id); + Set> values = new LinkedHashSet<>(tags.getOrDefault(key, List.of())); + values.removeAll(configured); + if (enabled) { + values.addAll(configured); + } + for (String name : unconditionalNames) { + ResourceKey valueKey = ResourceKey.create(registryKey, + new ResourceLocation(Mineralogy.MODID, name)); + registry.getHolder(valueKey).ifPresent(values::add); + } + tags.put(key, new ArrayList<>(values)); + } + + private static int size(Registry registry, ResourceKey> registryKey, + ResourceLocation id) { + return registry.getTag(TagKey.create(registryKey, id)).map(HolderSet.Named::size).orElse(0); + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/data/Material.java b/src/main/java/zone/moddev/mc/mineralogy/data/Material.java index d99bc1b05..a1d2439dc 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/data/Material.java +++ b/src/main/java/zone/moddev/mc/mineralogy/data/Material.java @@ -1,7 +1,6 @@ package zone.moddev.mc.mineralogy.data; import zone.moddev.mc.mineralogy.Mineralogy; -import zone.moddev.mc.mineralogy.RockType; import zone.moddev.mc.mineralogy.blocks.Rock; import zone.moddev.mc.mineralogy.blocks.RockStairs; import zone.moddev.mc.mineralogy.blocks.RockWall; @@ -10,11 +9,9 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.item.Item; import net.minecraft.world.item.BlockItem; -import net.minecraft.resources.ResourceLocation; public class Material { public String materialName; - public RockType rockType; public double hardness; public double blastResistance; public int toolHardnessLevel; @@ -26,9 +23,6 @@ public class Material { * @param materialName * Name of the block (should start with capital letter) * - * @param type - * Igneous, sedimentary, or metamorphic - * * @param hardness * How hard (time duration) the block is to pick. For reference, dirt * is 0.5, stone is 1.5, ores are 3, and obsidian is 50 @@ -40,17 +34,14 @@ public class Material { * @param cobbleEquivilent * is material equivalent to cobblestone */ - public Material(String materialName, RockType rockType, - double hardness, double blastResistance, int toolHardnessLevel, + public Material(String materialName, double hardness, double blastResistance, int toolHardnessLevel, boolean cobbleEquivilent) { - this(materialName, rockType, hardness, blastResistance, toolHardnessLevel, cobbleEquivilent, true); + this(materialName, hardness, blastResistance, toolHardnessLevel, cobbleEquivilent, true); } - public Material(String materialName, RockType rockType, - double hardness, double blastResistance, int toolHardnessLevel, + public Material(String materialName, double hardness, double blastResistance, int toolHardnessLevel, boolean cobbleEquivilent, boolean standardRockType) { this.materialName = materialName; - this.rockType = rockType; this.hardness = hardness; this.blastResistance = blastResistance; this.toolHardnessLevel = toolHardnessLevel; @@ -58,6 +49,10 @@ public Material(String materialName, RockType rockType, this.standardRockType = standardRockType; } + public String id() { + return materialName.toLowerCase(); + } + public Rock toRock(boolean isSmooth, boolean isBrick) { String name = this.materialName.toLowerCase(); diff --git a/src/main/java/zone/moddev/mc/mineralogy/data/MaterialData.java b/src/main/java/zone/moddev/mc/mineralogy/data/MaterialData.java index 75b8d7dd4..9a6298300 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/data/MaterialData.java +++ b/src/main/java/zone/moddev/mc/mineralogy/data/MaterialData.java @@ -1,38 +1,37 @@ package zone.moddev.mc.mineralogy.data; import java.util.ArrayList; -import zone.moddev.mc.mineralogy.RockType; public class MaterialData { - public static final Material ANDESITE = new Material("Andesite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material BASALT = new Material("Basalt", RockType.IGNEOUS, 5, 100, 2, true); - public static final Material DIORITE = new Material("Diorite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material GRANITE = new Material("Granite", RockType.IGNEOUS, 3, 15, 1, true); - public static final Material RHYOLITE = new Material("Rhyolite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material PEGMATITE = new Material("Pegmatite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material DIABASE = new Material("Diabase", RockType.IGNEOUS, 5, 100, 2, true); - public static final Material GABBRO = new Material("Gabbro", RockType.IGNEOUS, 5, 100, 2, true); - public static final Material PERIDOTITE = new Material("Peridotite", RockType.IGNEOUS, 3, 15, 0, true); - public static final Material BASALTIC_GLASS = new Material("Basaltic_glass", RockType.IGNEOUS, 3, 15, 0, true); - public static final Material SCORIA = new Material("Scoria", RockType.IGNEOUS, 1, 7, 0, true); - public static final Material TUFF = new Material("Tuff", RockType.IGNEOUS, 2, 10, 0, true); + public static final Material ANDESITE = new Material("Andesite", 1.5, 10, 0, true); + public static final Material BASALT = new Material("Basalt", 5, 100, 2, true); + public static final Material DIORITE = new Material("Diorite", 1.5, 10, 0, true); + public static final Material GRANITE = new Material("Granite", 3, 15, 1, true); + public static final Material RHYOLITE = new Material("Rhyolite", 1.5, 10, 0, true); + public static final Material PEGMATITE = new Material("Pegmatite", 1.5, 10, 0, true); + public static final Material DIABASE = new Material("Diabase", 5, 100, 2, true); + public static final Material GABBRO = new Material("Gabbro", 5, 100, 2, true); + public static final Material PERIDOTITE = new Material("Peridotite", 3, 15, 0, true); + public static final Material BASALTIC_GLASS = new Material("Basaltic_glass", 3, 15, 0, true); + public static final Material SCORIA = new Material("Scoria", 1, 7, 0, true); + public static final Material TUFF = new Material("Tuff", 2, 10, 0, true); - public static final Material SHALE = new Material("Shale", RockType.SEDIMENTARY, 1.5, 10, 0, true); - public static final Material CONGLOMERATE = new Material("Conglomerate", RockType.SEDIMENTARY, 1.5, 10, 0, true); - public static final Material DOLOMITE = new Material("Dolomite", RockType.SEDIMENTARY, 3, 15, 1, true); - public static final Material LIMESTONE = new Material("Limestone", RockType.SEDIMENTARY, 1.5, 10, 0, true); - public static final Material MARBLE = new Material("Marble", RockType.METAMORPHIC, 1.5, 10, 0, true); - public static final Material SILTSTONE = new Material("Siltstone", RockType.SEDIMENTARY, 1, 10, 0, true); - public static final Material ROCK_SALT = new Material("Rock_salt", RockType.SEDIMENTARY, 1.5, 10, 0, true, false); + public static final Material SHALE = new Material("Shale", 1.5, 10, 0, true); + public static final Material CONGLOMERATE = new Material("Conglomerate", 1.5, 10, 0, true); + public static final Material DOLOMITE = new Material("Dolomite", 3, 15, 1, true); + public static final Material LIMESTONE = new Material("Limestone", 1.5, 10, 0, true); + public static final Material MARBLE = new Material("Marble", 1.5, 10, 0, true); + public static final Material SILTSTONE = new Material("Siltstone", 1, 10, 0, true); + public static final Material ROCK_SALT = new Material("Rock_salt", 1.5, 10, 0, true, false); - public static final Material SLATE = new Material("Slate", RockType.METAMORPHIC, 1.5, 10, 0, true); - public static final Material SCHIST = new Material("Schist", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material GNEISS = new Material("Gneiss", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material PHYLLITE = new Material("Phyllite", RockType.METAMORPHIC, 1.5, 10, 0, true); - public static final Material AMPHIBOLITE = new Material("Amphibolite", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material HORNFELS = new Material("Hornfels", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material QUARTZITE = new Material("Quartzite", RockType.METAMORPHIC, 4, 15, 1, true); - public static final Material NOVACULITE = new Material("Novaculite", RockType.METAMORPHIC, 3, 15, 1, true); + public static final Material SLATE = new Material("Slate", 1.5, 10, 0, true); + public static final Material SCHIST = new Material("Schist", 3, 15, 1, true); + public static final Material GNEISS = new Material("Gneiss", 3, 15, 1, true); + public static final Material PHYLLITE = new Material("Phyllite", 1.5, 10, 0, true); + public static final Material AMPHIBOLITE = new Material("Amphibolite", 3, 15, 1, true); + public static final Material HORNFELS = new Material("Hornfels", 3, 15, 1, true); + public static final Material QUARTZITE = new Material("Quartzite", 4, 15, 1, true); + public static final Material NOVACULITE = new Material("Novaculite", 3, 15, 1, true); public static ArrayList toArray() { ArrayList materialArray = new ArrayList(); @@ -67,6 +66,12 @@ public static ArrayList toArray() { return materialArray; } + public static ArrayList allIncludingRockSalt() { + ArrayList materials = toArray(); + materials.add(ROCK_SALT); + return materials; + } + private MaterialData() { throw new IllegalAccessError("Not an instantiable class"); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java b/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java index 6dcc30683..abd4a7cc7 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java +++ b/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java @@ -5,6 +5,7 @@ import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.apache.logging.log4j.LogManager; @@ -12,82 +13,99 @@ import net.minecraftforge.fml.loading.FMLPaths; -/** Copies Mineralogy's bundled public guide beside its configuration on first use. */ +/** Copies the bundled human-facing Mineralogy guide beside its configuration. */ public final class DocumentationExporter { - private static final Logger LOGGER = LogManager.getLogger(); - private static final GuideFile[] FILES = { - guide("README.md"), - guide("PLAYER_GUIDE.md"), - guide("DEVELOPER_GUIDE.md"), - guide("CONTENT_CONFIG.md"), - guide("PROVIDER.md"), - guide("AGENTS.md"), - new GuideFile("examples/mineralogy-provider.json", - "/data/mineralogy/orespawn/provider.json") - }; + private static final Logger LOGGER = LogManager.getLogger(); + private static final GuideFile[] FILES = { + guide("README.md"), guide("PLAYER_GUIDE.md"), guide("DEVELOPER_GUIDE.md"), + guide("CONTENT_CONFIG.md"), guide("PROVIDER.md"), guide("VERSIONS.md"), + new GuideFile("examples/mineralogy-provider.json", "/data/mineralogy/orespawn/provider.json", + "src/main/resources/data/mineralogy/orespawn/provider.json") + }; - private DocumentationExporter() { - } + private DocumentationExporter() { + } - public static void exportBundledGuide() { - Path target = FMLPaths.CONFIGDIR.get().resolve("mineralogy-guide"); - try { - int exported = exportMissing(target); - if (exported > 0) { - LOGGER.info("Exported {} Mineralogy guide files to {}", exported, - target.toAbsolutePath()); - } - } catch (IOException e) { - LOGGER.warn("Could not export the Mineralogy guide to {}", target.toAbsolutePath(), e); - } - } + public static void exportBundledGuide() { + Path target = FMLPaths.CONFIGDIR.get().resolve("mineralogy-guide"); + try { + int exported = exportMissing(target); + if (exported > 0) LOGGER.info("Exported {} Mineralogy guide files to {}", exported, target.toAbsolutePath()); + } catch (IOException e) { + LOGGER.warn("Could not export the Mineralogy guide to {}", target.toAbsolutePath(), e); + } + } - /** Writes missing files only, so pack authors may annotate their exported copy. */ - public static int exportMissing(Path targetRoot) throws IOException { - int exported = 0; - for (GuideFile file : FILES) { - Path target = targetRoot.resolve(file.target); - if (Files.exists(target)) { - continue; - } - try (InputStream source = DocumentationExporter.class.getResourceAsStream(file.resource)) { - if (source == null) { - throw new IOException("Missing bundled documentation resource " + file.resource); - } - Files.createDirectories(target.getParent()); - Path temporary = Files.createTempFile(target.getParent(), - target.getFileName().toString(), ".tmp"); - try { - Files.copy(source, temporary, StandardCopyOption.REPLACE_EXISTING); - moveIntoPlace(temporary, target); - exported++; - } finally { - Files.deleteIfExists(temporary); - } - } - } - return exported; - } + public static int exportMissing(Path targetRoot) throws IOException { + int exported = 0; + for (GuideFile file : FILES) { + Path target = targetRoot.resolve(file.target); + if (Files.exists(target)) continue; + try (InputStream source = openSource(file)) { + Files.createDirectories(target.getParent()); + Path temporary = Files.createTempFile(target.getParent(), target.getFileName().toString(), ".tmp"); + try { + Files.copy(source, temporary, StandardCopyOption.REPLACE_EXISTING); + moveIntoPlace(temporary, target); + exported++; + } finally { + Files.deleteIfExists(temporary); + } + } + } + return exported; + } - private static GuideFile guide(String name) { - return new GuideFile(name, "/META-INF/mineralogy/docs/" + name); - } + private static InputStream openSource(GuideFile file) throws IOException { + return openSource(file.resource, file.developmentSource); + } - private static void moveIntoPlace(Path source, Path target) throws IOException { - try { - Files.move(source, target, StandardCopyOption.ATOMIC_MOVE); - } catch (AtomicMoveNotSupportedException e) { - Files.move(source, target); - } - } + static InputStream openSource(String resource, String developmentSource) throws IOException { + InputStream bundled = DocumentationExporter.class.getResourceAsStream(resource); + if (bundled != null) return bundled; - private static final class GuideFile { - private final String target; - private final String resource; + // Eclipse rebuilds bin/main from source folders and removes the guide + // files Gradle stages there. In an actual source checkout, recover from + // the authoritative files without weakening packaged-jar validation. + Path source = findDevelopmentSource(Paths.get("").toAbsolutePath(), developmentSource); + if (source != null) { + LOGGER.debug("Using source-checkout Mineralogy guide resource {}", source); + return Files.newInputStream(source); + } + throw new IOException("Missing bundled documentation resource " + resource); + } - private GuideFile(String target, String resource) { - this.target = target; - this.resource = resource; - } - } + static Path findDevelopmentSource(Path start, String relative) { + Path root = start.toAbsolutePath().normalize(); + for (int depth = 0; root != null && depth < 3; depth++, root = root.getParent()) { + Path candidate = root.resolve(relative).normalize(); + if (Files.isRegularFile(root.resolve("build.gradle")) && Files.isRegularFile(candidate)) { + return candidate; + } + } + return null; + } + + private static void moveIntoPlace(Path source, Path target) throws IOException { + try { + Files.move(source, target, StandardCopyOption.ATOMIC_MOVE); + } catch (AtomicMoveNotSupportedException e) { + Files.move(source, target); + } + } + + private static GuideFile guide(String name) { + return new GuideFile(name, "/META-INF/mineralogy/docs/" + name, "docs/" + name); + } + + private static final class GuideFile { + private final String target; + private final String resource; + private final String developmentSource; + private GuideFile(String target, String resource, String developmentSource) { + this.target = target; + this.resource = resource; + this.developmentSource = developmentSource; + } + } } 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 bda567163..9ed7a3643 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java @@ -2,7 +2,6 @@ import zone.moddev.mc.mineralogy.Mineralogy; import zone.moddev.mc.mineralogy.MineralogyConfig; -import zone.moddev.mc.mineralogy.RockType; import zone.moddev.mc.mineralogy.blocks.Chalk; import zone.moddev.mc.mineralogy.blocks.Chert; import zone.moddev.mc.mineralogy.blocks.DoubleSlab; @@ -237,11 +236,11 @@ public class Blocks { @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) { - for (zone.moddev.mc.mineralogy.data.Material material : MaterialData.toArray()) { - registerMaterialFamily(event, material, material.toRock(false, false), true); + for (zone.moddev.mc.mineralogy.data.Material material : MaterialData.toArray()) { + registerMaterialFamily(event, material, material.toRock(false, false)); } - registerMaterialFamily(event, MaterialData.ROCK_SALT, new RockSalt(), true); + registerMaterialFamily(event, MaterialData.ROCK_SALT, new RockSalt()); registerSpecialGeologyBlocks(event); registerDryWalls(event); @@ -257,7 +256,7 @@ public static void registerBlocks(RegistryEvent.Register event) { new Rock(false, 1.5F, 10.0F, 0, SoundType.STONE, "nitrate_block") ); - //event.getRegistry().register(MaterialData.BASALT.toRockWall(false, false)); + //event.getRegistry().register(MaterialData.BASALT.toRockWall(false, false)); } @@ -270,11 +269,6 @@ private static void registerSpecialGeologyBlocks(RegistryEvent.Register e event.getRegistry().registerAll(chert, gypsum, chalk, pumice); - MineralogyRegistry.sedimentaryStones.add(net.minecraft.world.level.block.Blocks.SANDSTONE); - MineralogyRegistry.sedimentaryStones.add(chert); - MineralogyRegistry.sedimentaryStones.add(gypsum); - MineralogyRegistry.sedimentaryStones.add(chalk); - MineralogyRegistry.igneousStones.add(pumice); } private static void registerDryWalls(RegistryEvent.Register event) { @@ -284,14 +278,11 @@ private static void registerDryWalls(RegistryEvent.Register event) { } private static void registerMaterialFamily(RegistryEvent.Register event, - zone.moddev.mc.mineralogy.data.Material material, Rock baseRock, boolean addToGeology) { + zone.moddev.mc.mineralogy.data.Material material, Rock baseRock) { event.getRegistry().register(baseRock); - if (addToGeology) { - addStoneType(material.rockType, baseRock); - } if (MineralogyConfig.generateRockSlab()) { - registerSlabPair(event, createSlab(material, false, false), material, false, false); + registerSlabPair(event, createSlab(material, false, false), baseRock, material, false, false); if (MineralogyConfig.generateRockFurnace()) { registerFurnacePair(event, material, false, false); } @@ -312,7 +303,7 @@ private static void registerMaterialFamily(RegistryEvent.Register event, registerReliefs(event, material); } if (MineralogyConfig.generateSmoothSlab()) { - registerSlabPair(event, createSlab(material, true, false), material, true, false); + registerSlabPair(event, createSlab(material, true, false), smoothRock, material, true, false); if (MineralogyConfig.generateSmoothFurnace()) { registerFurnacePair(event, material, true, false); } @@ -331,7 +322,7 @@ private static void registerMaterialFamily(RegistryEvent.Register event, event.getRegistry().register(brickRock); if (MineralogyConfig.generateBrickSlab()) { - registerSlabPair(event, createSlab(material, false, true), material, false, true); + registerSlabPair(event, createSlab(material, false, true), brickRock, material, false, true); if (MineralogyConfig.generateBrickFurnace()) { registerFurnacePair(event, material, false, true); } @@ -349,7 +340,7 @@ private static void registerMaterialFamily(RegistryEvent.Register event, event.getRegistry().register(smoothBrickRock); if (MineralogyConfig.generateSmoothBrickSlab()) { - registerSlabPair(event, createSlab(material, true, true), material, true, true); + registerSlabPair(event, createSlab(material, true, true), smoothBrickRock, material, true, true); if (MineralogyConfig.generateSmoothBrickFurnace()) { registerFurnacePair(event, material, true, true); } @@ -363,10 +354,10 @@ private static void registerMaterialFamily(RegistryEvent.Register event, } } - private static void registerSlabPair(RegistryEvent.Register event, RockSlab slab, + private static void registerSlabPair(RegistryEvent.Register event, RockSlab slab, Block fullBlock, zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { event.getRegistry().register(slab); - event.getRegistry().register(createDoubleSlab(slab, material, isSmooth, isBrick)); + event.getRegistry().register(createDoubleSlab(slab, fullBlock, material, isSmooth, isBrick)); } private static RockStairs createStairs(Block sourceBlock, zone.moddev.mc.mineralogy.data.Material material, @@ -388,10 +379,11 @@ private static RockSlab createSlab(zone.moddev.mc.mineralogy.data.Material mater material.toolHardnessLevel, SoundType.STONE, name + "_slab", name + "_double_slab"); } - private static DoubleSlab createDoubleSlab(Block sourceBlock, zone.moddev.mc.mineralogy.data.Material material, + private static DoubleSlab createDoubleSlab(Block sourceBlock, Block fullBlock, + zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { return new DoubleSlab((float) material.hardness, (float) material.blastResistance, - material.toolHardnessLevel, SoundType.STONE, sourceBlock, + material.toolHardnessLevel, SoundType.STONE, sourceBlock, fullBlock, getVariantName(material, isSmooth, isBrick) + "_double_slab"); } @@ -446,24 +438,4 @@ private static String getVariantName(zone.moddev.mc.mineralogy.data.Material mat return name; } - private static void addStoneType(RockType rockType, Block block) { - switch (rockType) { - case IGNEOUS: - MineralogyRegistry.igneousStones.add(block); - break; - case METAMORPHIC: - MineralogyRegistry.metamorphicStones.add(block); - break; - case SEDIMENTARY: - MineralogyRegistry.sedimentaryStones.add(block); - break; - case ANY: - MineralogyRegistry.igneousStones.add(block); - MineralogyRegistry.metamorphicStones.add(block); - MineralogyRegistry.sedimentaryStones.add(block); - break; - default: - break; - } - } } 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 44402834e..58ad701a9 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/Items.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java @@ -4,6 +4,7 @@ import java.util.List; import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; import zone.moddev.mc.mineralogy.blocks.DryWall; import zone.moddev.mc.mineralogy.blocks.Ore; import zone.moddev.mc.mineralogy.blocks.Rock; @@ -81,7 +82,11 @@ private static boolean isMineralogyBlockItem(Block block) { } private static BlockItem createBlockItem(Block block) { - Item.Properties properties = new Item.Properties().tab(MineralogyItemGroups.forBlock(block)); + ResourceLocation name = block.getRegistryName(); + Item.Properties properties = new Item.Properties(); + if (name != null && MineralogyConfig.isCreativeVisible(name.getPath())) { + properties.tab(MineralogyItemGroups.forBlock(block)); + } if (block instanceof RockFurnace) { properties.stacksTo(1); } else if (block instanceof RockSaltStreetLamp) { @@ -101,13 +106,16 @@ private static boolean isUnlitRockFurnace(Block block) { } private static Item createItem(String name) { - Item item = new Item(new Item.Properties().tab(MineralogyItemGroups.forItem())); + Item.Properties properties = new Item.Properties(); + if (MineralogyConfig.isCreativeVisible(name)) properties.tab(MineralogyItemGroups.forItem()); + Item item = new Item(properties); item.setRegistryName(Mineralogy.MODID, name); return item; } private static Item createFertilizer() { - MineralFertilizer item = new MineralFertilizer(MineralogyItemGroups.forItem()); + MineralFertilizer item = new MineralFertilizer(MineralogyConfig.isCreativeVisible("mineral_fertilizer") + ? MineralogyItemGroups.forFertilizer() : null); item.setRegistryName(Mineralogy.MODID, "mineral_fertilizer"); 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 66f84ad90..88c92dac2 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java @@ -56,8 +56,15 @@ public final class MineralogyFluids { BlockBehaviour.Properties.of(Material.WATER).noCollission().strength(100.0F).noDrops())); public static final RegistryObject CRUDE_OIL_BUCKET = ITEMS.register("crude_oil_bucket", () -> new MineralogyBucketItem(MineralogyFluids::crudeOil, - new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1) - .tab(MineralogyItemGroups.forItem()))); + bucketProperties())); + + private static Item.Properties bucketProperties() { + Item.Properties properties = new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1); + if (zone.moddev.mc.mineralogy.MineralogyConfig.isCreativeVisible("crude_oil_bucket")) { + properties.tab(MineralogyItemGroups.forItem()); + } + return properties; + } public static void register(IEventBus modBus) { FLUIDS.register(modBus); 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 6d566561c..bbae53d3d 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java @@ -2,12 +2,6 @@ import zone.moddev.mc.mineralogy.Mineralogy; import zone.moddev.mc.mineralogy.MineralogyConfig; -import zone.moddev.mc.mineralogy.blocks.Ore; -import zone.moddev.mc.mineralogy.blocks.Rock; -import zone.moddev.mc.mineralogy.blocks.RockRelief; -import zone.moddev.mc.mineralogy.blocks.RockSlab; -import zone.moddev.mc.mineralogy.blocks.RockStairs; -import zone.moddev.mc.mineralogy.blocks.RockWall; import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; @@ -28,29 +22,24 @@ public static CreativeModeTab forBlock(Block block) { return MainGroup.MINERALOGY; } - if (block instanceof RockRelief) { - return CreativeModeTabs.ITEM; + switch (MineralogyConfig.creativeTabPolicy().groupFor(block.getClass())) { + case ROCK: return RockGroup.ROCK; + case STAIR: return StairGroup.STAIR; + case SLAB: return SlabGroup.SLAB; + case WALL: return WallGroup.WALL; + default: return CreativeModeTabs.ITEM; } - if (block instanceof RockStairs) { - return StairGroup.STAIR; - } - if (block instanceof RockSlab) { - return SlabGroup.SLAB; - } - if (block instanceof RockWall) { - return WallGroup.WALL; - } - if (block instanceof Rock || block instanceof Ore) { - return RockGroup.ROCK; - } - - return CreativeModeTabs.ITEM; } public static CreativeModeTab forItem() { return MineralogyConfig.groupCreativeTabItemsByType() ? CreativeModeTabs.ITEM : MainGroup.MINERALOGY; } + public static CreativeModeTab forFertilizer() { + return MineralogyConfig.groupCreativeTabItemsByType() + ? CreativeModeTabs.ITEM : CreativeModeTab.TAB_MATERIALS; + } + private static CreativeModeTab create(String name, String iconItemName) { return new CreativeModeTab(Mineralogy.MODID + "." + name) { @Override @@ -59,7 +48,13 @@ public ItemStack makeIcon() { Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, iconItemName)); return item != null ? new ItemStack(item) : new ItemStack(net.minecraft.world.item.Items.IRON_PICKAXE); } - }; + + @Override + public boolean hasSearchBar() { + return true; + } + }.setBackgroundImage(new ResourceLocation("minecraft", + "textures/gui/container/creative_inventory/tab_item_search.png")); } private static final class MainGroup { diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java index a7b009e4f..eaaf06b6a 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java @@ -1,24 +1,14 @@ package zone.moddev.mc.mineralogy.init; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import zone.moddev.mc.mineralogy.util.BlockItemPair; -import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.Recipe; public class MineralogyRegistry { - public static final List sedimentaryStones = new ArrayList<>(); // stone block replacements that are Sedimentary - public static final List metamorphicStones = new ArrayList<>(); // stone block replacements that are Metamorphic - public static final List igneousStones = new ArrayList<>(); // stone block replacements that are Igneous public static final Map MineralogyBlockRegistry = new HashMap<>(); // all blocks used in this mod (blockID, BlockItemPair) public static final Map MineralogyItemRegistry = new HashMap<>(); // all items used in this mod (itemID, item) - public static final Map MineralogyRecipeRegistry = new HashMap<>(); // all recipes used in this mod (recipeID, Recipe) - - public static final Map BlocksToRegister = new HashMap<>(); // all blocks used in this mod (blockID, BlockItemPair) public static final Map ItemsToRegister = new HashMap<>(); // all items used in this mod (itemID, item) } diff --git a/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyMineralogy6ConfigMigrator.java b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyMineralogy6ConfigMigrator.java new file mode 100644 index 000000000..4fa7ea143 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyMineralogy6ConfigMigrator.java @@ -0,0 +1,251 @@ +package zone.moddev.mc.mineralogy.migration; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.AtomicMoveNotSupportedException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import org.apache.logging.log4j.Logger; + +/** + * Imports Mineralogy 6's JSON geology configuration without duplicating the + * stable rules supplied by Mineralogy's OreSpawn provider. + * + *

OreSpawn 4 can import the old files itself, but Mineralogy 6 used output + * block IDs as rule IDs. Copying those IDs verbatim beside the provider's + * stable IDs makes both ore rules active. This small pre-migration preserves + * all user values while canonicalising only uniquely matching provider-owned + * entries. Source files are never modified and established OreSpawn files are + * always authoritative.

+ */ +public final class LegacyMineralogy6ConfigMigrator { + public static final String LEGACY_GLOBAL_FILE = "mineralogy-geomes.json"; + public static final String ORESPAWN_GLOBAL_FILE = "orespawn-worldgen.json"; + public static final String LEGACY_WORLD_FILE = "mineralogy-geology.json"; + public static final String ORESPAWN_WORLD_FILE = "orespawn-worldgen.json"; + public static final String GLOBAL_REPORT_FILE = "orespawn-migration/migration-report.txt"; + public static final String WORLD_REPORT_FILE = "mineralogy-orespawn-upgrade-report.txt"; + + private static final String PROVIDER_RESOURCE = "data/mineralogy/orespawn/provider.json"; + private static final String PROVIDER_ID = "mineralogy"; + private static final int ORESPAWN_GLOBAL_SCHEMA = 6; + private static final int ORESPAWN_WORLD_SCHEMA = 5; + private static final String[] SECTIONS = { "rocks", "ores", "fluid_deposits" }; + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + + private LegacyMineralogy6ConfigMigrator() { + } + + public static boolean migrateGlobalConfig(Path configDirectory, Logger logger) { + if (configDirectory == null) return false; + Path directory = configDirectory.toAbsolutePath().normalize(); + return migrate(directory.resolve(LEGACY_GLOBAL_FILE), + directory.resolve(ORESPAWN_GLOBAL_FILE), + directory.resolve(GLOBAL_REPORT_FILE), "global", ORESPAWN_GLOBAL_SCHEMA, logger); + } + + public static boolean migrateWorldProfile(Path worldRoot, Logger logger) { + if (worldRoot == null) return false; + Path directory = worldRoot.toAbsolutePath().normalize().resolve("serverconfig"); + return migrate(directory.resolve(LEGACY_WORLD_FILE), + directory.resolve(ORESPAWN_WORLD_FILE), + directory.resolve(WORLD_REPORT_FILE), "world", ORESPAWN_WORLD_SCHEMA, logger); + } + + private static boolean migrate(Path source, Path target, Path report, + String scope, int targetSchema, Logger logger) { + if (!Files.isRegularFile(source) || Files.exists(target)) return false; + + try { + JsonObject root = readObject(source); + JsonObject provider = loadPackagedProvider(); + MigrationResult result = canonicalize(root, provider); + root.addProperty("schema_version", targetSchema); + root.addProperty("migrated_from", source.getFileName().toString()); + + if (!writeAtomicallyIfAbsent(target, GSON.toJson(root) + "\n")) return false; + writeAtomicallyIfAbsent(report, report(scope, source, target, result)); + info(logger, "Imported Mineralogy 6 {} geology settings into '{}' with {} rock, {} ore, " + + "and {} fluid-deposit rule IDs canonicalized; source retained unchanged", + scope, target, result.renamed.get("rocks"), result.renamed.get("ores"), + result.renamed.get("fluid_deposits")); + return true; + } catch (IOException | RuntimeException e) { + warn(logger, "Could not pre-migrate Mineralogy 6 geology settings from '" + source + + "'; leaving OreSpawn's normal migration path in control", e); + return false; + } + } + + private static MigrationResult canonicalize(JsonObject root, JsonObject provider) { + MigrationResult result = new MigrationResult(); + for (String sectionName : SECTIONS) { + JsonObject providerSection = object(provider, sectionName); + if (!root.has(sectionName) || !root.get(sectionName).isJsonObject() + || providerSection.entrySet().isEmpty()) { + continue; + } + + JsonObject sourceSection = root.getAsJsonObject(sectionName); + JsonObject targetSection = new JsonObject(); + Map> idsByBlock = providerIdsByBlock(providerSection); + + // Explicit stable entries win if a partially migrated file also + // contains the older block-named identity. + for (Map.Entry entry : sourceSection.entrySet()) { + if (providerSection.has(entry.getKey())) { + targetSection.add(entry.getKey(), providerOwnedRule(entry.getValue(), + providerSection.get(entry.getKey()))); + } + } + + for (Map.Entry entry : sourceSection.entrySet()) { + String oldId = entry.getKey(); + if (providerSection.has(oldId)) continue; + String output = outputBlock(oldId, entry.getValue()); + List matches = idsByBlock.get(output); + if (matches == null || matches.size() != 1) { + targetSection.add(oldId, entry.getValue().deepCopy()); + continue; + } + + String stableId = matches.get(0); + if (targetSection.has(stableId)) { + result.warnings.add(sectionName + ": skipped duplicate " + oldId + + " because stable rule " + stableId + " was already present"); + continue; + } + targetSection.add(stableId, providerOwnedRule(entry.getValue(), + providerSection.get(stableId))); + result.renamed.put(sectionName, result.renamed.get(sectionName) + 1); + } + root.add(sectionName, targetSection); + } + return result; + } + + private static JsonElement providerOwnedRule(JsonElement legacy, JsonElement provider) { + if (!legacy.isJsonObject() || !provider.isJsonObject()) return legacy.deepCopy(); + JsonObject result = legacy.getAsJsonObject().deepCopy(); + JsonObject providerRule = provider.getAsJsonObject(); + if (!result.has("block") && providerRule.has("block")) { + result.add("block", providerRule.get("block").deepCopy()); + } + result.addProperty("source_provider", PROVIDER_ID); + return result; + } + + private static Map> providerIdsByBlock(JsonObject providerSection) { + Map> result = new LinkedHashMap<>(); + for (Map.Entry entry : providerSection.entrySet()) { + String output = outputBlock("", entry.getValue()); + if (!output.isEmpty()) { + result.computeIfAbsent(output, ignored -> new ArrayList<>()).add(entry.getKey()); + } + } + return result; + } + + private static String outputBlock(String fallback, JsonElement value) { + if (value != null && value.isJsonObject()) { + JsonElement block = value.getAsJsonObject().get("block"); + if (block != null && block.isJsonPrimitive() && block.getAsJsonPrimitive().isString()) { + return block.getAsString(); + } + } + return fallback; + } + + private static String report(String scope, Path source, Path target, MigrationResult result) { + StringBuilder text = new StringBuilder(); + text.append("Mineralogy 6 to OreSpawn 4 JSON migration report\n"); + text.append("scope=").append(scope).append('\n'); + text.append("source=").append(source.getFileName()).append('\n'); + text.append("target=").append(target.getFileName()).append('\n'); + text.append("result=migrated\n"); + text.append("source_retained_unchanged=true\n"); + for (String section : SECTIONS) { + text.append("canonicalized.").append(section).append('=') + .append(result.renamed.get(section)).append('\n'); + } + for (String warning : result.warnings) { + text.append("warning=").append(warning).append('\n'); + } + return text.toString(); + } + + private static JsonObject readObject(Path path) throws IOException { + try (BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) { + JsonElement parsed = JsonParser.parseReader(reader); + if (!parsed.isJsonObject()) throw new IOException("JSON root is not an object"); + return parsed.getAsJsonObject(); + } + } + + private static JsonObject loadPackagedProvider() throws IOException { + InputStream stream = LegacyMineralogy6ConfigMigrator.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 = JsonParser.parseReader(reader); + if (!parsed.isJsonObject()) throw new IOException("provider root is not an object"); + return parsed.getAsJsonObject(); + } + } + + private static JsonObject object(JsonObject root, String name) { + return root.has(name) && root.get(name).isJsonObject() + ? root.getAsJsonObject(name) : new JsonObject(); + } + + private static boolean writeAtomicallyIfAbsent(Path destination, String content) + throws IOException { + if (Files.exists(destination)) return false; + Files.createDirectories(destination.getParent()); + Path temporary = destination.resolveSibling(destination.getFileName().toString() + ".tmp"); + Files.write(temporary, content.getBytes(StandardCharsets.UTF_8)); + try { + try { + Files.move(temporary, destination, StandardCopyOption.ATOMIC_MOVE); + } catch (AtomicMoveNotSupportedException e) { + Files.move(temporary, destination); + } + return true; + } finally { + Files.deleteIfExists(temporary); + } + } + + private static void info(Logger logger, String message, Object... values) { + if (logger != null) logger.info(message, values); + } + + private static void warn(Logger logger, String message, Throwable failure) { + if (logger != null) logger.warn(message, failure); + } + + private static final class MigrationResult { + final Map renamed = new LinkedHashMap<>(); + final List warnings = new ArrayList<>(); + + MigrationResult() { + for (String section : SECTIONS) renamed.put(section, 0); + } + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java new file mode 100644 index 000000000..f27a15853 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java @@ -0,0 +1,203 @@ +package zone.moddev.mc.mineralogy.migration; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.AtomicMoveNotSupportedException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.LinkedHashMap; +import java.util.Map; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import org.apache.logging.log4j.Logger; + +import zone.moddev.mc.mineralogy.MineralogyConfig; + +/** One-time, non-destructive migration of Mineralogy 5 ore settings to OreSpawn 4. */ +public final class LegacyOreConfigMigrator { + public static final String OVERRIDE_FILE = "mineralogy-orespawn.json"; + public static final String REPORT_FILE = "mineralogy-orespawn-upgrade-report.txt"; + public static final String GLOBAL_FILE = "orespawn-worldgen.json"; + private static final String PROVIDER_RESOURCE = "data/mineralogy/orespawn/provider.json"; + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static final OreSettings DEFAULTS = new OreSettings(16, 64, 1.0D, 16); + + private LegacyOreConfigMigrator() { + } + + public static void migrate(Path mineralogyConfigFile, Logger logger) { + if (mineralogyConfigFile == null || !Files.isRegularFile(mineralogyConfigFile)) return; + Path directory = mineralogyConfigFile.toAbsolutePath().getParent(); + if (directory == null) return; + Path report = directory.resolve(REPORT_FILE); + if (Files.isRegularFile(report)) return; + + StringBuilder text = new StringBuilder(); + text.append("Mineralogy 6 / OreSpawn 4 ore migration report\n"); + text.append("source=").append(MineralogyConfig.FILE_NAME).append('\n'); + Path override = directory.resolve(OVERRIDE_FILE); + if (Files.isRegularFile(override)) { + text.append("result=skipped\nreason=existing Mineralogy provider override is authoritative\n"); + writeAtomicallyIfAbsent(report, text.toString(), logger); + return; + } + if (Files.isRegularFile(directory.resolve(GLOBAL_FILE))) { + text.append("result=skipped\nreason=existing OreSpawn global configuration is authoritative\n"); + writeAtomicallyIfAbsent(report, text.toString(), logger); + return; + } + + Map values = MineralogyConfig.readLegacyValues(mineralogyConfigFile); + Map migrations = new LinkedHashMap<>(); + inspect("sulfur_ore", "sulphur_ore", "mineralogy:ore/mineralogy/sulfur_ore", + values, migrations, text, logger); + inspect("phosphorous_ore", null, "mineralogy:ore/mineralogy/phosphorous_ore", + values, migrations, text, logger); + inspect("nitrate_ore", null, "mineralogy:ore/mineralogy/nitrate_ore", + values, migrations, text, logger); + if (migrations.isEmpty()) { + text.append("result=defaults\nreason=no valid non-default ore settings\n"); + writeAtomicallyIfAbsent(report, text.toString(), logger); + return; + } + + try { + JsonObject provider = loadPackagedProvider(); + JsonObject ores = provider.getAsJsonObject("ores"); + for (Map.Entry entry : migrations.entrySet()) { + JsonObject dimension = ores.getAsJsonObject(entry.getKey()) + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + OreSettings settings = entry.getValue(); + dimension.addProperty("min_y", settings.minY); + dimension.addProperty("max_y", settings.maxYExclusive - 1); + dimension.addProperty("frequency", settings.frequency); + dimension.addProperty("quantity", settings.quantity); + } + writeAtomicallyIfAbsent(override, GSON.toJson(provider) + "\n", logger); + text.append("result=migrated\noverride=").append(OVERRIDE_FILE).append('\n'); + } catch (Exception e) { + text.append("result=defaults\nwarning=unable to create provider override\n"); + warn(logger, "Unable to create Mineralogy OreSpawn override; using packaged defaults", e); + } + writeAtomicallyIfAbsent(report, text.toString(), logger); + } + + private static void inspect(String primary, String fallback, String providerId, + Map values, Map migrations, + StringBuilder report, Logger logger) { + String selected = has(values, primary) ? primary : fallback != null && has(values, fallback) ? fallback : primary; + String prefix = "ores." + selected.toLowerCase() + "."; + String min = values.get(prefix + "miny"); + String max = values.get(prefix + "maxy"); + String frequency = values.get(prefix + "frequency"); + String quantity = values.get(prefix + "quantity"); + report.append("ore.").append(selected).append(".source=") + .append(value(min)).append(',').append(value(max)).append(',') + .append(value(frequency)).append(',').append(value(quantity)).append('\n'); + OreSettings parsed = parse(min, max, frequency, quantity); + if (parsed == null) { + report.append("ore.").append(selected).append(".result=default-invalid\n"); + if (min != null || max != null || frequency != null || quantity != null) { + warn(logger, "Invalid or incomplete legacy settings for " + selected + + "; using packaged OreSpawn defaults", null); + } + } else if (parsed.equals(DEFAULTS)) { + report.append("ore.").append(selected).append(".result=default\n"); + } else { + migrations.put(providerId, parsed); + report.append("ore.").append(selected).append(".result=migrated min_y=") + .append(parsed.minY).append(" max_y=").append(parsed.maxYExclusive - 1) + .append(" frequency=").append(parsed.frequency) + .append(" quantity=").append(parsed.quantity).append('\n'); + } + } + + private static boolean has(Map values, String ore) { + String prefix = "ores." + ore.toLowerCase() + "."; + return values.containsKey(prefix + "miny") || values.containsKey(prefix + "maxy") + || values.containsKey(prefix + "frequency") || values.containsKey(prefix + "quantity"); + } + + private static OreSettings parse(String min, String max, String frequency, String quantity) { + if (min == null && max == null && frequency == null && quantity == null) return DEFAULTS; + try { + int minY = Integer.parseInt(min); + int maxY = Integer.parseInt(max); + double attempts = Double.parseDouble(frequency); + int size = Integer.parseInt(quantity); + if (minY < -64 || maxY > 320 || maxY <= minY || !Double.isFinite(attempts) + || attempts < 0.0D || attempts > 64.0D || size < 1 || size > 64) return null; + return new OreSettings(minY, maxY, attempts, size); + } catch (RuntimeException e) { + return null; + } + } + + 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); + if (!parsed.isJsonObject()) throw new IOException("provider root is not an object"); + return parsed.getAsJsonObject(); + } + } + + private static void writeAtomicallyIfAbsent(Path destination, String content, Logger logger) { + if (Files.exists(destination)) return; + Path temporary = destination.resolveSibling(destination.getFileName().toString() + ".tmp"); + try { + Files.createDirectories(destination.getParent()); + Files.write(temporary, content.getBytes(StandardCharsets.UTF_8)); + try { + Files.move(temporary, destination, StandardCopyOption.ATOMIC_MOVE); + } catch (AtomicMoveNotSupportedException e) { + Files.move(temporary, destination); + } + } catch (IOException e) { + warn(logger, "Unable to write " + destination.getFileName(), e); + try { Files.deleteIfExists(temporary); } catch (IOException ignored) { } + } + } + + private static String value(String value) { return value == null ? "missing" : value; } + + private static void warn(Logger logger, String message, Throwable failure) { + if (logger == null) return; + if (failure == null) logger.warn(message); else logger.warn(message, failure); + } + + private static final class OreSettings { + final int minY; + final int maxYExclusive; + final double frequency; + final int quantity; + OreSettings(int minY, int maxYExclusive, double frequency, int quantity) { + this.minY = minY; + this.maxYExclusive = maxYExclusive; + this.frequency = frequency; + this.quantity = quantity; + } + @Override public boolean equals(Object other) { + if (!(other instanceof OreSettings)) return false; + OreSettings that = (OreSettings) other; + return minY == that.minY && maxYExclusive == that.maxYExclusive + && Double.compare(frequency, that.frequency) == 0 && quantity == that.quantity; + } + @Override public int hashCode() { + long bits = Double.doubleToLongBits(frequency); + int result = 31 * minY + maxYExclusive; + result = 31 * result + (int) (bits ^ bits >>> 32); + return 31 * result + quantity; + } + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java new file mode 100644 index 000000000..d50450ad8 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java @@ -0,0 +1,107 @@ +package zone.moddev.mc.mineralogy.patching; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +/** + * Converts pre-namespaced tile-entity identifiers into values Forge 36 can + * safely parse. Minecraft 1.14 and 1.15 construct a ResourceLocation before looking + * up the tile type, so an otherwise harmless missing legacy tile such as + * {@code Chest} aborts the complete chunk future because of its uppercase + * character. + */ +final class LegacyTileEntityIdNormalizer { + private static final Map VANILLA_IDS; + + static { + Map ids = new HashMap<>(); + ids.put("Furnace", "minecraft:furnace"); + ids.put("Chest", "minecraft:chest"); + ids.put("EnderChest", "minecraft:ender_chest"); + ids.put("RecordPlayer", "minecraft:jukebox"); + ids.put("Trap", "minecraft:dispenser"); + ids.put("Dropper", "minecraft:dropper"); + ids.put("Sign", "minecraft:sign"); + ids.put("MobSpawner", "minecraft:mob_spawner"); + ids.put("Music", "minecraft:noteblock"); + ids.put("Piston", "minecraft:piston"); + ids.put("Cauldron", "minecraft:brewing_stand"); + ids.put("EnchantTable", "minecraft:enchanting_table"); + ids.put("Airportal", "minecraft:end_portal"); + ids.put("Control", "minecraft:command_block"); + ids.put("Beacon", "minecraft:beacon"); + ids.put("Skull", "minecraft:skull"); + ids.put("DLDetector", "minecraft:daylight_detector"); + ids.put("Hopper", "minecraft:hopper"); + ids.put("Comparator", "minecraft:comparator"); + ids.put("FlowerPot", "minecraft:flower_pot"); + ids.put("Banner", "minecraft:banner"); + ids.put("Structure", "minecraft:structure_block"); + ids.put("EndGateway", "minecraft:end_gateway"); + ids.put("Bed", "minecraft:bed"); + ids.put("ShulkerBox", "minecraft:shulker_box"); + VANILLA_IDS = Collections.unmodifiableMap(ids); + } + + private LegacyTileEntityIdNormalizer() { + } + + static String normalize(String id) { + String vanilla = VANILLA_IDS.get(id); + if (vanilla != null) { + return vanilla; + } + if (isValid(id)) { + return id; + } + + int separator = id.indexOf(':'); + String namespace = separator >= 0 ? id.substring(0, separator) : "minecraft"; + String path = separator >= 0 ? id.substring(separator + 1) : id; + return sanitize(namespace) + ':' + sanitize(path); + } + + private static boolean isValid(String id) { + if (id == null || id.isEmpty()) { + return false; + } + int separator = id.indexOf(':'); + if (separator != id.lastIndexOf(':')) { + return false; + } + String namespace = separator >= 0 ? id.substring(0, separator) : "minecraft"; + String path = separator >= 0 ? id.substring(separator + 1) : id; + return !namespace.isEmpty() && !path.isEmpty() + && validPart(namespace, false) && validPart(path, true); + } + + private static boolean validPart(String value, boolean path) { + for (int index = 0; index < value.length(); ++index) { + char character = value.charAt(index); + boolean valid = character >= 'a' && character <= 'z' + || character >= '0' && character <= '9' + || character == '_' || character == '-' || character == '.' + || path && character == '/'; + if (!valid) { + return false; + } + } + return true; + } + + private static String sanitize(String value) { + String lower = value == null ? "" : value.toLowerCase(Locale.ROOT); + StringBuilder sanitized = new StringBuilder(lower.length()); + for (int index = 0; index < lower.length(); ++index) { + char character = lower.charAt(index); + boolean valid = character >= 'a' && character <= 'z' + || character >= '0' && character <= '9' + || character == '_' || character == '-' || character == '.' + || character == '/'; + sanitized.append(valid ? character : '_'); + } + return sanitized.length() == 0 ? "unknown" : sanitized.toString(); + } +} 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 b077698b0..618a31627 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java @@ -5,22 +5,28 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Method; +import java.lang.reflect.Field; import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.util.Arrays; import java.util.BitSet; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import com.mojang.serialization.Dynamic; + +import sun.misc.Unsafe; + import zone.moddev.mc.mineralogy.Mineralogy; import zone.moddev.mc.mineralogy.blocks.RockFurnace; import zone.moddev.mc.mineralogy.blocks.RockSaltLamp; import zone.moddev.mc.mineralogy.blocks.RockSaltStreetLamp; import zone.moddev.mc.mineralogy.blocks.RockSlab; +import zone.moddev.mc.mineralogy.migration.LegacyMineralogy6ConfigMigrator; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -76,6 +82,8 @@ public static void captureLegacyLevelData(CompoundTag root, Path levelPath) { } public static void onServerAboutToStart(ServerAboutToStartEvent event) { + LegacyMineralogy6ConfigMigrator.migrateWorldProfile( + event.getServer().getWorldPath(LevelResource.ROOT), LOGGER); File levelDat = event.getServer().getWorldPath(LevelResource.LEVEL_DATA_FILE).toFile(); prepareLegacyWorld(levelDat); } @@ -261,6 +269,7 @@ private static int installLegacyBlockStates(CompoundTag blockSnapshot) { LEGACY_ROCK_FURNACE_BLOCK_IDS.clear(); Map mineralogyIds = new HashMap<>(); ListTag savedIds = blockSnapshot.getList("ids", 10); + int highestStateId = 0; for (int index = 0; index < savedIds.size(); ++index) { CompoundTag savedId = savedIds.getCompound(index); String key = savedId.getString("K"); @@ -270,8 +279,9 @@ private static int installLegacyBlockStates(CompoundTag blockSnapshot) { ResourceLocation id = new ResourceLocation(key); int numericId = savedId.getInt("V"); mineralogyIds.put(id, numericId); + highestStateId = Math.max(highestStateId, (numericId << 4) | 15); } - Method addEntry = findStateRegistrationMethod(); + Dynamic[] legacyStates = expandFlatteningTable(highestStateId + 1); int mapped = 0; for (Map.Entry entry : mineralogyIds.entrySet()) { ResourceLocation oldId = entry.getKey(); @@ -282,17 +292,56 @@ private static int installLegacyBlockStates(CompoundTag blockSnapshot) { } for (int meta = 0; meta < 16; ++meta) { String stateNbt = NbtUtils.writeBlockState(legacyState(block, meta)).toString(); - try { - addEntry.invoke(null, (entry.getValue() << 4) | meta, stateNbt, new String[0]); - } catch (ReflectiveOperationException e) { - throw new IllegalStateException("Could not register legacy block state " + oldId + ":" + meta, e); - } + int stateId = (entry.getValue() << 4) | meta; + // The private vanilla register method may retain a JIT-compiled reference to + // its original final 4,096-entry array. Write the expanded array directly; + // Mineralogy has no legacy aliases that need its auxiliary name maps. + legacyStates[stateId] = BlockStateData.parse(stateNbt); ++mapped; } } return mapped; } + /** + * Minecraft 1.18 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. + */ + private static Dynamic[] expandFlatteningTable(int requiredLength) { + try { + Unsafe unsafe = unsafe(); + for (Field field : BlockStateData.class.getDeclaredFields()) { + Class type = field.getType(); + if (!java.lang.reflect.Modifier.isStatic(field.getModifiers()) || !type.isArray() + || type.getComponentType() != Dynamic.class) { + continue; + } + Object base = unsafe.staticFieldBase(field); + long offset = unsafe.staticFieldOffset(field); + Dynamic[] current = (Dynamic[]) unsafe.getObject(base, offset); + if (current == null || current.length < 4096) { + continue; + } + if (current.length >= requiredLength) { + return current; + } + Dynamic[] expanded = Arrays.copyOf(current, requiredLength); + unsafe.putObjectVolatile(base, offset, expanded); + return expanded; + } + } catch (ReflectiveOperationException e) { + throw new IllegalStateException("Could not access Minecraft's legacy block-state flattening table", e); + } + throw new IllegalStateException("Could not locate Minecraft's legacy block-state flattening table"); + } + + private static Unsafe unsafe() throws ReflectiveOperationException { + Field field = Unsafe.class.getDeclaredField("theUnsafe"); + field.setAccessible(true); + return (Unsafe) field.get(null); + } + private static boolean containsLegacyMineralogyBlock(CompoundTag level) { ListTag sections = level.getList("Sections", 10); for (int sectionIndex = 0; sectionIndex < sections.size(); ++sectionIndex) { @@ -407,14 +456,4 @@ private static Direction legacyLampFacing(int meta) { } } - private static Method findStateRegistrationMethod() { - for (Method method : BlockStateData.class.getDeclaredMethods()) { - Class[] parameters = method.getParameterTypes(); - if (parameters.length == 3 && parameters[0] == int.class - && parameters[1] == String.class && parameters[2] == String[].class) { - return method; - } - } - throw new IllegalStateException("Could not find Minecraft's legacy block-state registration method"); - } } 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 ebaad8d17..3108747a1 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java @@ -5,6 +5,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; +import net.minecraft.sounds.SoundEvent; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -15,7 +16,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE) public final class PatchHandler { private static final Logger LOGGER = LogManager.getLogger(); @@ -23,6 +24,10 @@ public final class PatchHandler { private static final ResourceLocation PUMMICE = mineralogyId("pummice"); private static final ResourceLocation LIMESTONE = mineralogyId("limestone"); private static final ResourceLocation PUMICE = mineralogyId("pumice"); + private static final ResourceLocation GRASS_PATH = minecraftId("grass_path"); + private static final ResourceLocation DIRT_PATH = minecraftId("dirt_path"); + private static final ResourceLocation SWEET_BERRIES_PICK = minecraftId("item.sweet_berries.pick_from_bush"); + private static final ResourceLocation SWEET_BERRY_BUSH_PICK = minecraftId("block.sweet_berry_bush.pick_berries"); private PatchHandler() { throw new IllegalAccessError("Not an instantiable class"); @@ -36,6 +41,7 @@ public static void remapMissingBlocks(RegistryEvent.MissingMappings event remapMissing(event, SAPROLITE, ForgeRegistries.BLOCKS.getValue(LIMESTONE)); remapMissing(event, PUMMICE, ForgeRegistries.BLOCKS.getValue(PUMICE)); + remapMissing(event, GRASS_PATH, ForgeRegistries.BLOCKS.getValue(DIRT_PATH)); } @SubscribeEvent @@ -46,21 +52,31 @@ public static void remapMissingItems(RegistryEvent.MissingMappings event) remapMissing(event, SAPROLITE, ForgeRegistries.ITEMS.getValue(LIMESTONE)); remapMissing(event, PUMMICE, ForgeRegistries.ITEMS.getValue(PUMICE)); + remapMissing(event, GRASS_PATH, ForgeRegistries.ITEMS.getValue(DIRT_PATH)); + } + + @SubscribeEvent + public static void remapMissingSounds(RegistryEvent.MissingMappings event) { + if (!MineralogyConfig.patchUpdate()) { + return; + } + + remapMissing(event, SWEET_BERRIES_PICK, ForgeRegistries.SOUND_EVENTS.getValue(SWEET_BERRY_BUSH_PICK)); } private static > void remapMissing(RegistryEvent.MissingMappings event, ResourceLocation oldId, T replacement) { - for (RegistryEvent.MissingMappings.Mapping mapping : event.getMappings()) { + for (RegistryEvent.MissingMappings.Mapping mapping : event.getAllMappings()) { if (!oldId.equals(mapping.key)) { continue; } if (replacement != null) { mapping.remap(replacement); - LOGGER.info("Remapped legacy Mineralogy id '{}' to '{}'", oldId, replacement.getRegistryName()); + LOGGER.info("Remapped legacy registry id '{}' to '{}'", oldId, replacement.getRegistryName()); } else { mapping.warn(); - LOGGER.warn("Could not remap legacy Mineralogy id '{}' because the replacement is not registered", oldId); + LOGGER.warn("Could not remap legacy registry id '{}' because the replacement is not registered", oldId); } } } @@ -68,4 +84,8 @@ private static > void remapMissing(RegistryEven private static ResourceLocation mineralogyId(String path) { return new ResourceLocation(Mineralogy.MODID, path); } + + private static ResourceLocation minecraftId(String path) { + return new ResourceLocation("minecraft", path); + } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index e64022db4..9bcd12187 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,71 +1,37 @@ -# This is an example mods.toml file. It contains the data relating to the loading mods. -# There are several mandatory fields (#mandatory), and many more that are optional (#optional). -# The overall format is standard TOML format, v0.5.0. -# Note that there are a couple of TOML lists in this file. -# Find more information on toml format here: https://github.com/toml-lang/toml -# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml -modLoader="javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. -# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. -# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +modLoader="javafml" +loaderVersion="[40,)" license="LGPL-2.1" -# A URL to refer people to when problems occur with this mod -issueTrackerURL="https://github.com/SkyBlade1978/MinecraftMineralogy/issues" #optional -# A list of mods - how many allowed here is determined by the individual mod loader -[[mods]] #mandatory -# The modid of the mod -modId="mineralogy" #mandatory -# The version number of the mod -version="${file.jarVersion}" #mandatory -# A display name for the mod -displayName="Minecraft Mineralogy" #mandatory -# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional -# A URL for the "homepage" for this mod, displayed in the mod UI -displayURL="https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy" #optional -# A file name (in the root of the mod JAR) containing a logo for display -#logoFile="examplemod.png" #optional -# A text field displayed in the mod UI -credits="Cyanobacterium, SkyBlade1978, JRIwanek, FoxNekitsune, Proxy, the MMD Team, Forge, FML, and the mod authors" #optional -# A text field displayed in the mod UI -authors="Cyanobacterium, SkyBlade1978, JRIwanek" #optional -# Display Test controls the display for your mod in the server connection screen -# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. -# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. -# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. -# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. -# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. -#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) +issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/issues" +displayURL="https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy" +logoFile="" +credits="Cyanobacterium, SkyBlade1978, JRIwanek, FoxNekitsune, Proxy, the MMD Team, Forge, FML, and the mod authors" +authors="Cyanobacterium, SkyBlade1978, JRIwanek" + +[[mods]] +modId="mineralogy" +version="${version}" +displayName="Minecraft Mineralogy" +description=''' +Fills the world with real-world rocks. +''' + +[[dependencies.mineralogy]] + modId="forge" + mandatory=true + versionRange="[40.3.0,41)" + ordering="NONE" + side="BOTH" -# The description text for the mod (multi line!) (#mandatory) -description='''Adds real-world rocks, matching building blocks, furnaces, ores, and geological content. OreSpawn places Mineralogy's configured strata and deposits.''' [[dependencies.mineralogy]] -modId="orespawn" -mandatory=true -versionRange="[4.0.0,5.0.0)" -ordering="AFTER" -side="BOTH" + modId="orespawn" + mandatory=true + versionRange="[4.0.6,5.0.0)" + ordering="AFTER" + side="BOTH" -# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.mineralogy]] #optional -# the modid of the dependency -modId="forge" #mandatory -# Does this dependency have to exist - if not, ordering below must be specified -mandatory=true #mandatory -# The version range of the dependency -versionRange="[40,)" #mandatory -# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory -# BEFORE - This mod is loaded BEFORE the dependency -# AFTER - This mod is loaded AFTER the dependency -ordering="NONE" -# Side this dependency is applied on - BOTH, CLIENT, or SERVER -side="BOTH" -# Here's another dependency [[dependencies.mineralogy]] -modId="minecraft" -mandatory=true -# This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange="[1.18.2,1.19)" -ordering="NONE" -side="BOTH" + modId="minecraft" + mandatory=true + versionRange="[1.18.2]" + ordering="NONE" + side="BOTH" diff --git a/src/main/resources/assets/mineralogy/lang/de_au.json b/src/main/resources/assets/mineralogy/lang/de_au.json index 2928e5a1c..09373688a 100644 --- a/src/main/resources/assets/mineralogy/lang/de_au.json +++ b/src/main/resources/assets/mineralogy/lang/de_au.json @@ -1,202 +1,202 @@ { "block.mineralogy.andesite": "Andesit", - "block.mineralogy.andesite_stairs": "Andesit-Treppe", - "block.mineralogy.andesite_slab": "Andesit-Platte", - "block.mineralogy.andesite_brick": "Andesit-Ziegelstein", - "block.mineralogy.andesite_brick_stairs": "Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_brick_slab": "Andesit-Ziegelsteinplatte", - "block.mineralogy.andesite_smooth": "Polierter Andesit", - "block.mineralogy.andesite_smooth_stairs": "Polierte Andesit-Treppe", - "block.mineralogy.andesite_smooth_slab": "Polierte Andesit-Platte", - "block.mineralogy.andesite_smooth_brick": "Polierter Andesit-Ziegelstein", - "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_smooth_brick_slab": "Polierte Andesit-Ziegelsteinplatte", + "block.mineralogy.andesite_stairs": "Treppe aus Andesit", + "block.mineralogy.andesite_slab": "Stufe aus Andesit", + "block.mineralogy.andesite_brick": "Ziegel aus Andesit", + "block.mineralogy.andesite_brick_stairs": "Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_brick_slab": "Ziegelstufe aus Andesit", + "block.mineralogy.andesite_smooth": "Polierter Block aus Andesit", + "block.mineralogy.andesite_smooth_stairs": "Polierte Treppe aus Andesit", + "block.mineralogy.andesite_smooth_slab": "Polierte Stufe aus Andesit", + "block.mineralogy.andesite_smooth_brick": "Polierte Ziegel aus Andesit", + "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_smooth_brick_slab": "Polierte Ziegelstufe aus Andesit", "block.mineralogy.basalt": "Basalt", - "block.mineralogy.basalt_stairs": "Basalt Treppen", - "block.mineralogy.basalt_slab": "Basaltplatte", - "block.mineralogy.basalt_brick": "Basaltstein", - "block.mineralogy.basalt_brick_stairs": "Basaltstein Treppen", - "block.mineralogy.basalt_brick_slab": "Basaltstein Platte", - "block.mineralogy.basalt_smooth": "Polierter Basalt", - "block.mineralogy.basalt_smooth_stairs": "Polierte Basalt Treppen", - "block.mineralogy.basalt_smooth_slab": "Polierte Basaltplatte", - "block.mineralogy.basalt_smooth_brick": "Polierter Basaltstein", - "block.mineralogy.basalt_smooth_brick_stairs": "Polierter Basaltstein-Treppen", - "block.mineralogy.basalt_smooth_brick_slab": "Polierter Basaltstein-Platte", + "block.mineralogy.basalt_stairs": "Treppe aus Basalt", + "block.mineralogy.basalt_slab": "Stufe aus Basalt", + "block.mineralogy.basalt_brick": "Ziegel aus Basalt", + "block.mineralogy.basalt_brick_stairs": "Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_brick_slab": "Ziegelstufe aus Basalt", + "block.mineralogy.basalt_smooth": "Polierter Block aus Basalt", + "block.mineralogy.basalt_smooth_stairs": "Polierte Treppe aus Basalt", + "block.mineralogy.basalt_smooth_slab": "Polierte Stufe aus Basalt", + "block.mineralogy.basalt_smooth_brick": "Polierte Ziegel aus Basalt", + "block.mineralogy.basalt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_smooth_brick_slab": "Polierte Ziegelstufe aus Basalt", "block.mineralogy.diorite": "Diorit", - "block.mineralogy.diorite_stairs": "Diorite Treppen", - "block.mineralogy.diorite_slab": "Dioritplatte", - "block.mineralogy.diorite_brick": "Dioritstein", - "block.mineralogy.diorite_brick_stairs": "Dioritstein Treppen", - "block.mineralogy.diorite_brick_slab": "Dioritstein Platte", - "block.mineralogy.diorite_smooth": "Polierter Diorit", - "block.mineralogy.diorite_smooth_stairs": "Polierte Diorit-Treppe", - "block.mineralogy.diorite_smooth_slab": "Polierte Dioritplatte", - "block.mineralogy.diorite_smooth_brick": "Polierter Diorit-Ziegelstein", - "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Dioritstein-Treppe", - "block.mineralogy.diorite_smooth_brick_slab": "Polierte Dioritstein-Platte", + "block.mineralogy.diorite_stairs": "Treppe aus Diorit", + "block.mineralogy.diorite_slab": "Stufe aus Diorit", + "block.mineralogy.diorite_brick": "Ziegel aus Diorit", + "block.mineralogy.diorite_brick_stairs": "Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_brick_slab": "Ziegelstufe aus Diorit", + "block.mineralogy.diorite_smooth": "Polierter Block aus Diorit", + "block.mineralogy.diorite_smooth_stairs": "Polierte Treppe aus Diorit", + "block.mineralogy.diorite_smooth_slab": "Polierte Stufe aus Diorit", + "block.mineralogy.diorite_smooth_brick": "Polierte Ziegel aus Diorit", + "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_smooth_brick_slab": "Polierte Ziegelstufe aus Diorit", "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Granit Treppe", - "block.mineralogy.granite_slab": "Granitplatte", - "block.mineralogy.granite_brick": "Granitstein", - "block.mineralogy.granite_brick_stairs": "Granitstein-Treppen", - "block.mineralogy.granite_brick_slab": "Granitstein-Platte", - "block.mineralogy.granite_smooth": "Polierter Granit", - "block.mineralogy.granite_smooth_stairs": "Polierte Granittreppe", - "block.mineralogy.granite_smooth_slab": "Polierte Granitplatte", - "block.mineralogy.granite_smooth_brick": "Polierter Granitstein", - "block.mineralogy.granite_smooth_brick_stairs": "Polierter Granitstein-Treppen", - "block.mineralogy.granite_smooth_brick_slab": "Polierter Granitstein-Platte", + "block.mineralogy.granite_stairs": "Treppe aus Granit", + "block.mineralogy.granite_slab": "Stufe aus Granit", + "block.mineralogy.granite_brick": "Ziegel aus Granit", + "block.mineralogy.granite_brick_stairs": "Ziegeltreppe aus Granit", + "block.mineralogy.granite_brick_slab": "Ziegelstufe aus Granit", + "block.mineralogy.granite_smooth": "Polierter Block aus Granit", + "block.mineralogy.granite_smooth_stairs": "Polierte Treppe aus Granit", + "block.mineralogy.granite_smooth_slab": "Polierte Stufe aus Granit", + "block.mineralogy.granite_smooth_brick": "Polierte Ziegel aus Granit", + "block.mineralogy.granite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Granit", + "block.mineralogy.granite_smooth_brick_slab": "Polierte Ziegelstufe aus Granit", "block.mineralogy.rhyolite": "Rhyolith", - "block.mineralogy.rhyolite_stairs": "Rhyolith Treppen", - "block.mineralogy.rhyolite_slab": "Rhyolithplatte", - "block.mineralogy.rhyolite_brick": "Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_brick_stairs": "Rhyolith-Ziegelstein-Treppen", - "block.mineralogy.rhyolite_brick_slab": "Rhyolith-Ziegelstein-Platte", - "block.mineralogy.rhyolite_smooth": "Polierter Rhyolith", - "block.mineralogy.rhyolite_smooth_stairs": "Polierte Rhyolith Treppen", - "block.mineralogy.rhyolite_smooth_slab": "Polierte Rhyolithplatte", - "block.mineralogy.rhyolite_smooth_brick": "Polierter Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Rhyolith-Ziegelstein-Treppe", - "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Rhyolith-Ziegelstein-Platte", + "block.mineralogy.rhyolite_stairs": "Treppe aus Rhyolith", + "block.mineralogy.rhyolite_slab": "Stufe aus Rhyolith", + "block.mineralogy.rhyolite_brick": "Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_brick_stairs": "Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_brick_slab": "Ziegelstufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth": "Polierter Block aus Rhyolith", + "block.mineralogy.rhyolite_smooth_stairs": "Polierte Treppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_slab": "Polierte Stufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick": "Polierte Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Ziegelstufe aus Rhyolith", "block.mineralogy.pegmatite": "Pegmatit", - "block.mineralogy.pegmatite_stairs": "Pegmatite-Treppen", - "block.mineralogy.pegmatite_slab": "Pegmatite-Platte", - "block.mineralogy.pegmatite_brick": "Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_brick_stairs": "Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_brick_slab": "Pegmatite Ziegelsteinplatte", - "block.mineralogy.pegmatite_smooth": "Polierter Pegmatit", - "block.mineralogy.pegmatite_smooth_stairs": "Polierte Pegmatite Treppen", - "block.mineralogy.pegmatite_smooth_slab": "Polierte Pegmatite Platte", - "block.mineralogy.pegmatite_smooth_brick": "Polierter Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Pegmatite Ziegelsteinplatte", - "block.mineralogy.shale": "Schiefer", - "block.mineralogy.shale_stairs": "Schiefer Treppen", - "block.mineralogy.shale_slab": "Schieferplatte", - "block.mineralogy.shale_brick": "Schiefer-Ziegelstein", - "block.mineralogy.shale_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.shale_smooth": "Polierter Schiefer", - "block.mineralogy.shale_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.shale_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.shale_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.shale_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.pegmatite_stairs": "Treppe aus Pegmatit", + "block.mineralogy.pegmatite_slab": "Stufe aus Pegmatit", + "block.mineralogy.pegmatite_brick": "Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_brick_stairs": "Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_brick_slab": "Ziegelstufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth": "Polierter Block aus Pegmatit", + "block.mineralogy.pegmatite_smooth_stairs": "Polierte Treppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_slab": "Polierte Stufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick": "Polierte Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Ziegelstufe aus Pegmatit", + "block.mineralogy.shale": "Tonschiefer", + "block.mineralogy.shale_stairs": "Treppe aus Tonschiefer", + "block.mineralogy.shale_slab": "Stufe aus Tonschiefer", + "block.mineralogy.shale_brick": "Ziegel aus Tonschiefer", + "block.mineralogy.shale_brick_stairs": "Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_brick_slab": "Ziegelstufe aus Tonschiefer", + "block.mineralogy.shale_smooth": "Polierter Block aus Tonschiefer", + "block.mineralogy.shale_smooth_stairs": "Polierte Treppe aus Tonschiefer", + "block.mineralogy.shale_smooth_slab": "Polierte Stufe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick": "Polierte Ziegel aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_slab": "Polierte Ziegelstufe aus Tonschiefer", "block.mineralogy.conglomerate": "Konglomerat", - "block.mineralogy.conglomerate_stairs": "Konglomerat Treppen", - "block.mineralogy.conglomerate_slab": "Konglomeratplatte", - "block.mineralogy.conglomerate_brick": "Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_brick_stairs": "Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_brick_slab": "Konglomerat-Ziegelstein-Platte", - "block.mineralogy.conglomerate_smooth": "Poliertes Konglomerat", - "block.mineralogy.conglomerate_smooth_stairs": "Polierte Konglomerat Treppen", - "block.mineralogy.conglomerate_smooth_slab": "Polierte Konglomeratplatte", - "block.mineralogy.conglomerate_smooth_brick": "Polierter Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierter Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_smooth_brick_slab": "Polierter Konglomerat-Ziegelstein-Platte", + "block.mineralogy.conglomerate_stairs": "Treppe aus Konglomerat", + "block.mineralogy.conglomerate_slab": "Stufe aus Konglomerat", + "block.mineralogy.conglomerate_brick": "Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_brick_stairs": "Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_brick_slab": "Ziegelstufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth": "Polierter Block aus Konglomerat", + "block.mineralogy.conglomerate_smooth_stairs": "Polierte Treppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_slab": "Polierte Stufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick": "Polierte Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Polierte Ziegelstufe aus Konglomerat", "block.mineralogy.dolomite": "Dolomit", - "block.mineralogy.dolomite_stairs": "Dolomit Treppen", - "block.mineralogy.dolomite_slab": "Dolomit-Platte", - "block.mineralogy.dolomite_brick": "Dolomit-Ziegelstein", - "block.mineralogy.dolomite_brick_stairs": "Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_brick_slab": "Dolomit-Ziegelstein-Platte", - "block.mineralogy.dolomite_smooth": "Polierter Dolomit", - "block.mineralogy.dolomite_smooth_stairs": "Polierte Dolomitentreppe", - "block.mineralogy.dolomite_smooth_slab": "Polierte Dolomitplatte", - "block.mineralogy.dolomite_smooth_brick": "Polierter Dolomitstein", - "block.mineralogy.dolomite_smooth_brick_stairs": "Polierter Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_smooth_brick_slab": "Polierter Dolomit-Ziegelstein-Platte", + "block.mineralogy.dolomite_stairs": "Treppe aus Dolomit", + "block.mineralogy.dolomite_slab": "Stufe aus Dolomit", + "block.mineralogy.dolomite_brick": "Ziegel aus Dolomit", + "block.mineralogy.dolomite_brick_stairs": "Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_brick_slab": "Ziegelstufe aus Dolomit", + "block.mineralogy.dolomite_smooth": "Polierter Block aus Dolomit", + "block.mineralogy.dolomite_smooth_stairs": "Polierte Treppe aus Dolomit", + "block.mineralogy.dolomite_smooth_slab": "Polierte Stufe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick": "Polierte Ziegel aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_slab": "Polierte Ziegelstufe aus Dolomit", "block.mineralogy.limestone": "Kalkstein", - "block.mineralogy.limestone_stairs": "Kalkstein-Treppen", - "block.mineralogy.limestone_slab": "Kalksteinplatte", - "block.mineralogy.limestone_brick": "Kalkstein-Ziegelstein", - "block.mineralogy.limestone_brick_stairs": "Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_brick_slab": "Kalkstein-Ziegelstein-Platte", - "block.mineralogy.limestone_smooth": "Polierter Kalkstein", - "block.mineralogy.limestone_smooth_stairs": "Polierte Kalksteintreppe", - "block.mineralogy.limestone_smooth_slab": "Polierte Kalksteinplatte", - "block.mineralogy.limestone_smooth_brick": "Polierter Kalkstein-Ziegelstein", - "block.mineralogy.limestone_smooth_brick_stairs": "Polierter Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_smooth_brick_slab": "Polierter Kalkstein-Ziegelstein-Platte", + "block.mineralogy.limestone_stairs": "Treppe aus Kalkstein", + "block.mineralogy.limestone_slab": "Stufe aus Kalkstein", + "block.mineralogy.limestone_brick": "Ziegel aus Kalkstein", + "block.mineralogy.limestone_brick_stairs": "Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_brick_slab": "Ziegelstufe aus Kalkstein", + "block.mineralogy.limestone_smooth": "Polierter Block aus Kalkstein", + "block.mineralogy.limestone_smooth_stairs": "Polierte Treppe aus Kalkstein", + "block.mineralogy.limestone_smooth_slab": "Polierte Stufe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick": "Polierte Ziegel aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_slab": "Polierte Ziegelstufe aus Kalkstein", "block.mineralogy.slate": "Schiefer", - "block.mineralogy.slate_stairs": "Schiefer Treppen", - "block.mineralogy.slate_slab": "Schieferplatte", - "block.mineralogy.slate_brick": "Schiefer-Ziegelstein", - "block.mineralogy.slate_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.slate_smooth": "Polierter Schiefer", - "block.mineralogy.slate_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.slate_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.slate_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.slate_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist": "Schiefer", - "block.mineralogy.schist_stairs": "Schiefer Treppen", - "block.mineralogy.schist_slab": "Schieferplatte", - "block.mineralogy.schist_brick": "Schiefer-Ziegelstein", - "block.mineralogy.schist_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist_smooth": "Polierter Schiefer", - "block.mineralogy.schist_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.schist_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.schist_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.schist_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.slate_stairs": "Treppe aus Schiefer", + "block.mineralogy.slate_slab": "Stufe aus Schiefer", + "block.mineralogy.slate_brick": "Ziegel aus Schiefer", + "block.mineralogy.slate_brick_stairs": "Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_brick_slab": "Ziegelstufe aus Schiefer", + "block.mineralogy.slate_smooth": "Polierter Block aus Schiefer", + "block.mineralogy.slate_smooth_stairs": "Polierte Treppe aus Schiefer", + "block.mineralogy.slate_smooth_slab": "Polierte Stufe aus Schiefer", + "block.mineralogy.slate_smooth_brick": "Polierte Ziegel aus Schiefer", + "block.mineralogy.slate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_smooth_brick_slab": "Polierte Ziegelstufe aus Schiefer", + "block.mineralogy.schist": "Glimmerschiefer", + "block.mineralogy.schist_stairs": "Treppe aus Glimmerschiefer", + "block.mineralogy.schist_slab": "Stufe aus Glimmerschiefer", + "block.mineralogy.schist_brick": "Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_brick_stairs": "Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_brick_slab": "Ziegelstufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth": "Polierter Block aus Glimmerschiefer", + "block.mineralogy.schist_smooth_stairs": "Polierte Treppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_slab": "Polierte Stufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick": "Polierte Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_stairs": "Polierte Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_slab": "Polierte Ziegelstufe aus Glimmerschiefer", "block.mineralogy.gneiss": "Gneis", - "block.mineralogy.gneiss_stairs": "Gneistreppe", - "block.mineralogy.gneiss_slab": "Gneisplatte", - "block.mineralogy.gneiss_brick": "Gneis Ziegel", - "block.mineralogy.gneiss_brick_stairs": "Gneis Ziegeltreppen", - "block.mineralogy.gneiss_brick_slab": "Gneissteinplatte", - "block.mineralogy.gneiss_smooth": "Polierter Gneis", - "block.mineralogy.gneiss_smooth_stairs": "Polierte Gneistreppe", - "block.mineralogy.gneiss_smooth_slab": "Polierte Gneisplatte", - "block.mineralogy.gneiss_smooth_brick": "Polierter Gneisstein", - "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Gneisziegeltreppen", - "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Gneissteinplatte", + "block.mineralogy.gneiss_stairs": "Treppe aus Gneis", + "block.mineralogy.gneiss_slab": "Stufe aus Gneis", + "block.mineralogy.gneiss_brick": "Ziegel aus Gneis", + "block.mineralogy.gneiss_brick_stairs": "Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_brick_slab": "Ziegelstufe aus Gneis", + "block.mineralogy.gneiss_smooth": "Polierter Block aus Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Polierte Treppe aus Gneis", + "block.mineralogy.gneiss_smooth_slab": "Polierte Stufe aus Gneis", + "block.mineralogy.gneiss_smooth_brick": "Polierte Ziegel aus Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Ziegelstufe aus Gneis", "block.mineralogy.marble": "Marmor", - "block.mineralogy.marble_stairs": "Marmortreppe", - "block.mineralogy.marble_slab": "Marmorplatte", - "block.mineralogy.marble_brick": "Marmor Backstein", - "block.mineralogy.marble_brick_stairs": "Marmor Backstein Treppe", - "block.mineralogy.marble_brick_slab": "Marmor Ziegelplatte", - "block.mineralogy.marble_smooth": "Polierter Marmor", - "block.mineralogy.marble_smooth_stairs": "Polierte Marmortreppe", - "block.mineralogy.marble_smooth_slab": "Polierte Marmorplatte", - "block.mineralogy.marble_smooth_brick": "Polierter Marmor Ziegelstein", - "block.mineralogy.marble_smooth_brick_stairs": "Polierte Marmor Ziegelstein Treppen", - "block.mineralogy.marble_smooth_brick_slab": "Polierte Marmor Ziegelstein Platte", + "block.mineralogy.marble_stairs": "Treppe aus Marmor", + "block.mineralogy.marble_slab": "Stufe aus Marmor", + "block.mineralogy.marble_brick": "Ziegel aus Marmor", + "block.mineralogy.marble_brick_stairs": "Ziegeltreppe aus Marmor", + "block.mineralogy.marble_brick_slab": "Ziegelstufe aus Marmor", + "block.mineralogy.marble_smooth": "Polierter Block aus Marmor", + "block.mineralogy.marble_smooth_stairs": "Polierte Treppe aus Marmor", + "block.mineralogy.marble_smooth_slab": "Polierte Stufe aus Marmor", + "block.mineralogy.marble_smooth_brick": "Polierte Ziegel aus Marmor", + "block.mineralogy.marble_smooth_brick_stairs": "Polierte Ziegeltreppe aus Marmor", + "block.mineralogy.marble_smooth_brick_slab": "Polierte Ziegelstufe aus Marmor", "block.mineralogy.phyllite": "Phyllit", - "block.mineralogy.phyllite_stairs": "Phyllit Treppen", - "block.mineralogy.phyllite_slab": "Phyllitplatte", - "block.mineralogy.phyllite_brick": "Phyllitstein", - "block.mineralogy.phyllite_brick_stairs": "Phyllite-Ziegelstein-Treppen", - "block.mineralogy.phyllite_brick_slab": "Phyllite-Ziegelstein-Platte", - "block.mineralogy.phyllite_smooth": "Polierter Phyllit", - "block.mineralogy.phyllite_smooth_stairs": "Polierte Phyllit Treppen", - "block.mineralogy.phyllite_smooth_slab": "Polierte Phyllitplatte", - "block.mineralogy.phyllite_smooth_brick": "Polierter Phyllit-Stein", - "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Phyllit-Ziegelstein-Treppe", - "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Phyllit-Ziegelsteinplatte", + "block.mineralogy.phyllite_stairs": "Treppe aus Phyllit", + "block.mineralogy.phyllite_slab": "Stufe aus Phyllit", + "block.mineralogy.phyllite_brick": "Ziegel aus Phyllit", + "block.mineralogy.phyllite_brick_stairs": "Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_brick_slab": "Ziegelstufe aus Phyllit", + "block.mineralogy.phyllite_smooth": "Polierter Block aus Phyllit", + "block.mineralogy.phyllite_smooth_stairs": "Polierte Treppe aus Phyllit", + "block.mineralogy.phyllite_smooth_slab": "Polierte Stufe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick": "Polierte Ziegel aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Ziegelstufe aus Phyllit", "block.mineralogy.amphibolite": "Amphibolit", - "block.mineralogy.amphibolite_stairs": "Amphibolit Treppen", - "block.mineralogy.amphibolite_slab": "Amphibolit-Platte", - "block.mineralogy.amphibolite_brick": "Amphibolitstein", - "block.mineralogy.amphibolite_brick_stairs": "Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_brick_slab": "Amphibolit-Ziegelstein-Platte", - "block.mineralogy.amphibolite_smooth": "Polierter Amphibolit", - "block.mineralogy.amphibolite_smooth_stairs": "Polierte Amphibolit Treppen", - "block.mineralogy.amphibolite_smooth_slab": "Polierte Amphibolitplatte", - "block.mineralogy.amphibolite_smooth_brick": "Polierter Amphibolit-Stein", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Amphibolit-Ziegelstein-Platte", - "item.mineralogy.gypsum_dust": "Gips Staub", - "item.mineralogy.sulfur_dust": "Schwefel Staub", - "item.mineralogy.phosphorous_dust": "Phosphor Staub", - "item.mineralogy.nitrate_dust": "Nitrat Staub", + "block.mineralogy.amphibolite_stairs": "Treppe aus Amphibolit", + "block.mineralogy.amphibolite_slab": "Stufe aus Amphibolit", + "block.mineralogy.amphibolite_brick": "Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_brick_stairs": "Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_brick_slab": "Ziegelstufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth": "Polierter Block aus Amphibolit", + "block.mineralogy.amphibolite_smooth_stairs": "Polierte Treppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_slab": "Polierte Stufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick": "Polierte Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Ziegelstufe aus Amphibolit", + "item.mineralogy.gypsum_dust": "Gipspulver", + "item.mineralogy.sulfur_dust": "Schwefelpulver", + "item.mineralogy.phosphorous_dust": "Phosphorpulver", + "item.mineralogy.nitrate_dust": "Nitratpulver", "item.mineralogy.mineral_fertilizer": "Mineraldünger", - "block.mineralogy.chert": "Chert", + "block.mineralogy.chert": "Hornstein", "block.mineralogy.gypsum": "Gips", "block.mineralogy.pumice": "Bimsstein", "block.mineralogy.sulfur_block": "Schwefel", @@ -204,737 +204,737 @@ "block.mineralogy.phosphorous_block": "Phosphor", "block.mineralogy.phosphorous_ore": "Phosphorerz", "block.mineralogy.nitrate_block": "Nitrat", - "block.mineralogy.nitrate_ore": "Nitrat-Erz", - "block.mineralogy.drywall_black": "Schwarzer Trockenbau", - "block.mineralogy.drywall_red": "Roter Trockenbau", - "block.mineralogy.drywall_green": "Grüner Trockenbau", - "block.mineralogy.drywall_brown": "Brauner Trockenbau", - "block.mineralogy.drywall_blue": "Blaue Trockenmauer", - "block.mineralogy.drywall_purple": "Lila Trockenbau", - "block.mineralogy.drywall_cyan": "Cyan Trockenbau", - "block.mineralogy.drywall_silver": "Silberner Trockenbau", - "block.mineralogy.drywall_gray": "Graue Trockenmauer", - "block.mineralogy.drywall_pink": "Rosa Trockenbau", - "block.mineralogy.drywall_lime": "Kalk Trockenbau", - "block.mineralogy.drywall_yellow": "Gelber Trockenbau", - "block.mineralogy.drywall_light_blue": "Hellblaue Trockenmauer", - "block.mineralogy.drywall_magenta": "Magenta Trockenbau", - "block.mineralogy.drywall_orange": "Orange Trockenbau", - "block.mineralogy.drywall_white": "Weißer Trockenbau", - "block.mineralogy.andesite_wall": "Andesit-Wand", - "block.mineralogy.andesite_brick_wall": "Andesit-Backsteinmauer", - "block.mineralogy.andesite_smooth_wall": "Andesite polierte Wand", - "block.mineralogy.andesite_smooth_brick_wall": "Andesite polierte Backsteinmauer", - "block.mineralogy.basalt_wall": "Basaltmauer", - "block.mineralogy.basalt_brick_wall": "Basalt-Backsteinmauer", - "block.mineralogy.basalt_smooth_wall": "Basalt polierte Wand", - "block.mineralogy.basalt_smooth_brick_wall": "Basalt polierte Backsteinmauer", - "block.mineralogy.diorite_wall": "Dioritwand", - "block.mineralogy.diorite_brick_wall": "Diorit-Ziegelmauer", - "block.mineralogy.diorite_smooth_wall": "Diorite polierte Wand", - "block.mineralogy.diorite_smooth_brick_wall": "Diorite polierte Backsteinmauer", - "block.mineralogy.granite_wall": "Granitwand", - "block.mineralogy.granite_brick_wall": "Granit-Backsteinmauer", - "block.mineralogy.granite_smooth_wall": "Granit poliert Wand", - "block.mineralogy.granite_smooth_brick_wall": "Granit poliert Ziegelmauer", - "block.mineralogy.rhyolite_wall": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_wall": "Rhyolith-Backsteinmauer", - "block.mineralogy.rhyolite_smooth_wall": "Rhyolith poliert Wand", - "block.mineralogy.rhyolite_smooth_brick_wall": "Rhyolith polierte Backsteinmauer", - "block.mineralogy.pegmatite_wall": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_wall": "Pegmatite-Ziegelmauer", - "block.mineralogy.pegmatite_smooth_wall": "Pegmatite polierte Wand", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pegmatite polierte Backsteinmauer", - "block.mineralogy.shale_wall": "Schieferwand", - "block.mineralogy.shale_brick_wall": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_wall": "Schiefer poliert Wand", - "block.mineralogy.shale_smooth_brick_wall": "Schiefer poliert Ziegelmauer", - "block.mineralogy.conglomerate_wall": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_wall": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_wall": "Konglomerat polierte Wand", - "block.mineralogy.conglomerate_smooth_brick_wall": "Konglomerat polierte Backsteinmauer", - "block.mineralogy.dolomite_wall": "Dolomitenwand", - "block.mineralogy.dolomite_brick_wall": "Dolomit-Ziegelmauer", - "block.mineralogy.dolomite_smooth_wall": "Dolomit polierte Wand", - "block.mineralogy.dolomite_smooth_brick_wall": "Dolomit polierte Ziegelmauer", - "block.mineralogy.limestone_wall": "Kalksteinmauer", - "block.mineralogy.limestone_brick_wall": "Kalkstein-Backsteinmauer", - "block.mineralogy.limestone_smooth_wall": "Kalkstein polierte Wand", - "block.mineralogy.limestone_smooth_brick_wall": "Kalkstein poliert Ziegelmauer", - "block.mineralogy.marble_wall": "Marmorwand", - "block.mineralogy.marble_brick_wall": "Marmor Backsteinmauer", - "block.mineralogy.marble_smooth_wall": "Marmor poliert Wand", - "block.mineralogy.marble_smooth_brick_wall": "Marmor poliert Ziegelmauer", - "block.mineralogy.slate_wall": "Schieferwand", - "block.mineralogy.slate_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.slate_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.slate_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.schist_wall": "Schieferwand", - "block.mineralogy.schist_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.schist_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.schist_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.gneiss_wall": "Gneismauer", - "block.mineralogy.gneiss_brick_wall": "Gneis-Backsteinmauer", - "block.mineralogy.gneiss_smooth_wall": "Gneis polierte Wand", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis polierte Backsteinmauer", - "block.mineralogy.phyllite_wall": "Phyllitwand", - "block.mineralogy.phyllite_brick_wall": "Phyllit-Ziegelmauer", - "block.mineralogy.phyllite_smooth_wall": "Phyllite polierte Wand", - "block.mineralogy.phyllite_smooth_brick_wall": "Phyllite polierte Backsteinmauer", - "block.mineralogy.amphibolite_wall": "Amphibolit Wand", - "block.mineralogy.amphibolite_brick_wall": "Amphibolit-Backsteinmauer", - "block.mineralogy.amphibolite_smooth_wall": "Amphibolit poliert Wand", - "block.mineralogy.amphibolite_smooth_brick_wall": "Amphibolite polierte Backsteinmauer", - "block.mineralogy.andesite_furnace": "Andesit-Ofen", - "block.mineralogy.andesite_brick_furnace": "Andesit-Ziegelofen", - "block.mineralogy.andesite_smooth_furnace": "Andesite polierte Ofen", - "block.mineralogy.andesite_smooth_brick_furnace": "Andesite polierte Ziegelofen", - "block.mineralogy.basalt_furnace": "Basaltmauer", - "block.mineralogy.basalt_brick_furnace": "Basalt-Ziegelofen", - "block.mineralogy.basalt_smooth_furnace": "Basalt polierte Ofen", - "block.mineralogy.basalt_smooth_brick_furnace": "Basalt polierte Ziegelofen", - "block.mineralogy.diorite_furnace": "Dioritwand", - "block.mineralogy.diorite_brick_furnace": "Diorit-Ziegelofen", - "block.mineralogy.diorite_smooth_furnace": "Diorite polierte Ofen", - "block.mineralogy.diorite_smooth_brick_furnace": "Diorite polierte Ziegelofen", - "block.mineralogy.granite_furnace": "Granitwand", - "block.mineralogy.granite_brick_furnace": "Granit-Ziegelofen", - "block.mineralogy.granite_smooth_furnace": "Granit poliert Ofen", - "block.mineralogy.granite_smooth_brick_furnace": "Granit poliert Ziegelofen", - "block.mineralogy.rhyolite_furnace": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_furnace": "Rhyolith-Ziegelofen", - "block.mineralogy.rhyolite_smooth_furnace": "Rhyolith poliert Ofen", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Rhyolith polierte Ziegelofen", - "block.mineralogy.pegmatite_furnace": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_furnace": "Pegmatite-Ziegelofen", - "block.mineralogy.pegmatite_smooth_furnace": "Pegmatite polierte Ofen", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Pegmatite polierte Ziegelofen", - "block.mineralogy.shale_furnace": "Schieferwand", - "block.mineralogy.shale_brick_furnace": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_furnace": "Schiefer poliert Ofen", - "block.mineralogy.shale_smooth_brick_furnace": "Schiefer poliert Ziegelofen", - "block.mineralogy.conglomerate_furnace": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_furnace": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_furnace": "Konglomerat polierte Ofen", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Konglomerat polierte Ziegelofen", - "block.mineralogy.dolomite_furnace": "Dolomitenwand", - "block.mineralogy.dolomite_brick_furnace": "Dolomit-Ziegelofen", - "block.mineralogy.dolomite_smooth_furnace": "Dolomit polierte Ofen", - "block.mineralogy.dolomite_smooth_brick_furnace": "Dolomit polierte Ziegelofen", - "block.mineralogy.limestone_furnace": "Kalksteinmauer", - "block.mineralogy.limestone_brick_furnace": "Kalkstein-Ziegelofen", - "block.mineralogy.limestone_smooth_furnace": "Kalkstein polierte Ofen", - "block.mineralogy.limestone_smooth_brick_furnace": "Kalkstein poliert Ziegelofen", - "block.mineralogy.marble_furnace": "Marmorwand", - "block.mineralogy.marble_brick_furnace": "Marmor Ziegelofen", - "block.mineralogy.marble_smooth_furnace": "Marmor poliert Ofen", - "block.mineralogy.marble_smooth_brick_furnace": "Marmor poliert Ziegelofen", - "block.mineralogy.slate_furnace": "Schieferwand", - "block.mineralogy.slate_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.slate_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.slate_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.schist_furnace": "Schieferwand", - "block.mineralogy.schist_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.schist_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.schist_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.gneiss_furnace": "Gneismauer", - "block.mineralogy.gneiss_brick_furnace": "Gneis-Ziegelofen", - "block.mineralogy.gneiss_smooth_furnace": "Gneis polierte Ofen", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis polierte Ziegelofen", - "block.mineralogy.phyllite_furnace": "Phyllitwand", - "block.mineralogy.phyllite_brick_furnace": "Phyllit-Ziegelofen", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite polierte Ofen", - "block.mineralogy.phyllite_smooth_brick_furnace": "Phyllite polierte Ziegelofen", - "block.mineralogy.amphibolite_furnace": "Amphibolit Ofen", - "block.mineralogy.amphibolite_brick_furnace": "Amphibolit-Ziegelofen", - "block.mineralogy.amphibolite_smooth_furnace": "Amphibolit poliert Ofen", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Amphibolite polierte Ziegelofen", + "block.mineralogy.nitrate_ore": "Nitraterz", + "block.mineralogy.drywall_black": "Gipskartonplatte (Schwarz)", + "block.mineralogy.drywall_red": "Gipskartonplatte (Rot)", + "block.mineralogy.drywall_green": "Gipskartonplatte (Grün)", + "block.mineralogy.drywall_brown": "Gipskartonplatte (Braun)", + "block.mineralogy.drywall_blue": "Gipskartonplatte (Blau)", + "block.mineralogy.drywall_purple": "Gipskartonplatte (Violett)", + "block.mineralogy.drywall_cyan": "Gipskartonplatte (Türkis)", + "block.mineralogy.drywall_silver": "Gipskartonplatte (Hellgrau)", + "block.mineralogy.drywall_gray": "Gipskartonplatte (Grau)", + "block.mineralogy.drywall_pink": "Gipskartonplatte (Rosa)", + "block.mineralogy.drywall_lime": "Gipskartonplatte (Hellgrün)", + "block.mineralogy.drywall_yellow": "Gipskartonplatte (Gelb)", + "block.mineralogy.drywall_light_blue": "Gipskartonplatte (Hellblau)", + "block.mineralogy.drywall_magenta": "Gipskartonplatte (Magenta)", + "block.mineralogy.drywall_orange": "Gipskartonplatte (Orange)", + "block.mineralogy.drywall_white": "Gipskartonplatte (Weiß)", + "block.mineralogy.andesite_wall": "Mauer aus Andesit", + "block.mineralogy.andesite_brick_wall": "Ziegelmauer aus Andesit", + "block.mineralogy.andesite_smooth_wall": "Polierte Mauer aus Andesit", + "block.mineralogy.andesite_smooth_brick_wall": "Polierte Ziegelmauer aus Andesit", + "block.mineralogy.basalt_wall": "Mauer aus Basalt", + "block.mineralogy.basalt_brick_wall": "Ziegelmauer aus Basalt", + "block.mineralogy.basalt_smooth_wall": "Polierte Mauer aus Basalt", + "block.mineralogy.basalt_smooth_brick_wall": "Polierte Ziegelmauer aus Basalt", + "block.mineralogy.diorite_wall": "Mauer aus Diorit", + "block.mineralogy.diorite_brick_wall": "Ziegelmauer aus Diorit", + "block.mineralogy.diorite_smooth_wall": "Polierte Mauer aus Diorit", + "block.mineralogy.diorite_smooth_brick_wall": "Polierte Ziegelmauer aus Diorit", + "block.mineralogy.granite_wall": "Mauer aus Granit", + "block.mineralogy.granite_brick_wall": "Ziegelmauer aus Granit", + "block.mineralogy.granite_smooth_wall": "Polierte Mauer aus Granit", + "block.mineralogy.granite_smooth_brick_wall": "Polierte Ziegelmauer aus Granit", + "block.mineralogy.rhyolite_wall": "Mauer aus Rhyolith", + "block.mineralogy.rhyolite_brick_wall": "Ziegelmauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_wall": "Polierte Mauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_wall": "Polierte Ziegelmauer aus Rhyolith", + "block.mineralogy.pegmatite_wall": "Mauer aus Pegmatit", + "block.mineralogy.pegmatite_brick_wall": "Ziegelmauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_wall": "Polierte Mauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_wall": "Polierte Ziegelmauer aus Pegmatit", + "block.mineralogy.shale_wall": "Mauer aus Tonschiefer", + "block.mineralogy.shale_brick_wall": "Ziegelmauer aus Tonschiefer", + "block.mineralogy.shale_smooth_wall": "Polierte Mauer aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_wall": "Polierte Ziegelmauer aus Tonschiefer", + "block.mineralogy.conglomerate_wall": "Mauer aus Konglomerat", + "block.mineralogy.conglomerate_brick_wall": "Ziegelmauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_wall": "Polierte Mauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Polierte Ziegelmauer aus Konglomerat", + "block.mineralogy.dolomite_wall": "Mauer aus Dolomit", + "block.mineralogy.dolomite_brick_wall": "Ziegelmauer aus Dolomit", + "block.mineralogy.dolomite_smooth_wall": "Polierte Mauer aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_wall": "Polierte Ziegelmauer aus Dolomit", + "block.mineralogy.limestone_wall": "Mauer aus Kalkstein", + "block.mineralogy.limestone_brick_wall": "Ziegelmauer aus Kalkstein", + "block.mineralogy.limestone_smooth_wall": "Polierte Mauer aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_wall": "Polierte Ziegelmauer aus Kalkstein", + "block.mineralogy.marble_wall": "Mauer aus Marmor", + "block.mineralogy.marble_brick_wall": "Ziegelmauer aus Marmor", + "block.mineralogy.marble_smooth_wall": "Polierte Mauer aus Marmor", + "block.mineralogy.marble_smooth_brick_wall": "Polierte Ziegelmauer aus Marmor", + "block.mineralogy.slate_wall": "Mauer aus Schiefer", + "block.mineralogy.slate_brick_wall": "Ziegelmauer aus Schiefer", + "block.mineralogy.slate_smooth_wall": "Polierte Mauer aus Schiefer", + "block.mineralogy.slate_smooth_brick_wall": "Polierte Ziegelmauer aus Schiefer", + "block.mineralogy.schist_wall": "Mauer aus Glimmerschiefer", + "block.mineralogy.schist_brick_wall": "Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_wall": "Polierte Mauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_wall": "Polierte Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.gneiss_wall": "Mauer aus Gneis", + "block.mineralogy.gneiss_brick_wall": "Ziegelmauer aus Gneis", + "block.mineralogy.gneiss_smooth_wall": "Polierte Mauer aus Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Polierte Ziegelmauer aus Gneis", + "block.mineralogy.phyllite_wall": "Mauer aus Phyllit", + "block.mineralogy.phyllite_brick_wall": "Ziegelmauer aus Phyllit", + "block.mineralogy.phyllite_smooth_wall": "Polierte Mauer aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_wall": "Polierte Ziegelmauer aus Phyllit", + "block.mineralogy.amphibolite_wall": "Mauer aus Amphibolit", + "block.mineralogy.amphibolite_brick_wall": "Ziegelmauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_wall": "Polierte Mauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_wall": "Polierte Ziegelmauer aus Amphibolit", + "block.mineralogy.andesite_furnace": "Ofen aus Andesit", + "block.mineralogy.andesite_brick_furnace": "Ziegelofen aus Andesit", + "block.mineralogy.andesite_smooth_furnace": "Polierter Ofen aus Andesit", + "block.mineralogy.andesite_smooth_brick_furnace": "Polierter Ziegelofen aus Andesit", + "block.mineralogy.basalt_furnace": "Ofen aus Basalt", + "block.mineralogy.basalt_brick_furnace": "Ziegelofen aus Basalt", + "block.mineralogy.basalt_smooth_furnace": "Polierter Ofen aus Basalt", + "block.mineralogy.basalt_smooth_brick_furnace": "Polierter Ziegelofen aus Basalt", + "block.mineralogy.diorite_furnace": "Ofen aus Diorit", + "block.mineralogy.diorite_brick_furnace": "Ziegelofen aus Diorit", + "block.mineralogy.diorite_smooth_furnace": "Polierter Ofen aus Diorit", + "block.mineralogy.diorite_smooth_brick_furnace": "Polierter Ziegelofen aus Diorit", + "block.mineralogy.granite_furnace": "Ofen aus Granit", + "block.mineralogy.granite_brick_furnace": "Ziegelofen aus Granit", + "block.mineralogy.granite_smooth_furnace": "Polierter Ofen aus Granit", + "block.mineralogy.granite_smooth_brick_furnace": "Polierter Ziegelofen aus Granit", + "block.mineralogy.rhyolite_furnace": "Ofen aus Rhyolith", + "block.mineralogy.rhyolite_brick_furnace": "Ziegelofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_furnace": "Polierter Ofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Polierter Ziegelofen aus Rhyolith", + "block.mineralogy.pegmatite_furnace": "Ofen aus Pegmatit", + "block.mineralogy.pegmatite_brick_furnace": "Ziegelofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_furnace": "Polierter Ofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Polierter Ziegelofen aus Pegmatit", + "block.mineralogy.shale_furnace": "Ofen aus Tonschiefer", + "block.mineralogy.shale_brick_furnace": "Ziegelofen aus Tonschiefer", + "block.mineralogy.shale_smooth_furnace": "Polierter Ofen aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_furnace": "Polierter Ziegelofen aus Tonschiefer", + "block.mineralogy.conglomerate_furnace": "Ofen aus Konglomerat", + "block.mineralogy.conglomerate_brick_furnace": "Ziegelofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_furnace": "Polierter Ofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Polierter Ziegelofen aus Konglomerat", + "block.mineralogy.dolomite_furnace": "Ofen aus Dolomit", + "block.mineralogy.dolomite_brick_furnace": "Ziegelofen aus Dolomit", + "block.mineralogy.dolomite_smooth_furnace": "Polierter Ofen aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_furnace": "Polierter Ziegelofen aus Dolomit", + "block.mineralogy.limestone_furnace": "Ofen aus Kalkstein", + "block.mineralogy.limestone_brick_furnace": "Ziegelofen aus Kalkstein", + "block.mineralogy.limestone_smooth_furnace": "Polierter Ofen aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_furnace": "Polierter Ziegelofen aus Kalkstein", + "block.mineralogy.marble_furnace": "Ofen aus Marmor", + "block.mineralogy.marble_brick_furnace": "Ziegelofen aus Marmor", + "block.mineralogy.marble_smooth_furnace": "Polierter Ofen aus Marmor", + "block.mineralogy.marble_smooth_brick_furnace": "Polierter Ziegelofen aus Marmor", + "block.mineralogy.slate_furnace": "Ofen aus Schiefer", + "block.mineralogy.slate_brick_furnace": "Ziegelofen aus Schiefer", + "block.mineralogy.slate_smooth_furnace": "Polierter Ofen aus Schiefer", + "block.mineralogy.slate_smooth_brick_furnace": "Polierter Ziegelofen aus Schiefer", + "block.mineralogy.schist_furnace": "Ofen aus Glimmerschiefer", + "block.mineralogy.schist_brick_furnace": "Ziegelofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_furnace": "Polierter Ofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_furnace": "Polierter Ziegelofen aus Glimmerschiefer", + "block.mineralogy.gneiss_furnace": "Ofen aus Gneis", + "block.mineralogy.gneiss_brick_furnace": "Ziegelofen aus Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Polierter Ofen aus Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Polierter Ziegelofen aus Gneis", + "block.mineralogy.phyllite_furnace": "Ofen aus Phyllit", + "block.mineralogy.phyllite_brick_furnace": "Ziegelofen aus Phyllit", + "block.mineralogy.phyllite_smooth_furnace": "Polierter Ofen aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_furnace": "Polierter Ziegelofen aus Phyllit", + "block.mineralogy.amphibolite_furnace": "Ofen aus Amphibolit", + "block.mineralogy.amphibolite_brick_furnace": "Ziegelofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_furnace": "Polierter Ofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Polierter Ziegelofen aus Amphibolit", "block.mineralogy.diabase": "Diabas", - "block.mineralogy.diabase_stairs": "Diabas Treppe", - "block.mineralogy.diabase_slab": "Diabas Platte", - "block.mineralogy.diabase_brick": "Diabas Backstein", - "block.mineralogy.diabase_brick_stairs": "Diabas Ziegelsteintreppen", - "block.mineralogy.diabase_brick_slab": "Diabas Ziegelplatte", - "block.mineralogy.diabase_smooth": "Polished Diabas", - "block.mineralogy.diabase_smooth_stairs": "Diabas Polierte Treppe", - "block.mineralogy.diabase_smooth_slab": "Diabas Polierte Platte", - "block.mineralogy.diabase_smooth_brick": "Diabas Polierter Ziegelstein", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabas Polierte Ziegelsteintreppen", - "block.mineralogy.diabase_smooth_brick_slab": "Diabas Polierte Ziegelplatte", - "block.mineralogy.diabase_wall": "Diabas Wand", - "block.mineralogy.diabase_brick_wall": "Diabas Ziegelwand", - "block.mineralogy.diabase_smooth_wall": "Diabas Polierte Wand", - "block.mineralogy.diabase_smooth_brick_wall": "Diabas Polierte Backsteinmauer", - "block.mineralogy.diabase_furnace": "Diabas Ofen", - "block.mineralogy.diabase_brick_furnace": "Diabas Ziegelofen", - "block.mineralogy.diabase_smooth_furnace": "Diabas Polierter Ofen", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabas Polierter Ziegelofen", + "block.mineralogy.diabase_stairs": "Treppe aus Diabas", + "block.mineralogy.diabase_slab": "Stufe aus Diabas", + "block.mineralogy.diabase_brick": "Ziegel aus Diabas", + "block.mineralogy.diabase_brick_stairs": "Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_brick_slab": "Ziegelstufe aus Diabas", + "block.mineralogy.diabase_smooth": "Polierter Block aus Diabas", + "block.mineralogy.diabase_smooth_stairs": "Polierte Treppe aus Diabas", + "block.mineralogy.diabase_smooth_slab": "Polierte Stufe aus Diabas", + "block.mineralogy.diabase_smooth_brick": "Polierte Ziegel aus Diabas", + "block.mineralogy.diabase_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_smooth_brick_slab": "Polierte Ziegelstufe aus Diabas", + "block.mineralogy.diabase_wall": "Mauer aus Diabas", + "block.mineralogy.diabase_brick_wall": "Ziegelmauer aus Diabas", + "block.mineralogy.diabase_smooth_wall": "Polierte Mauer aus Diabas", + "block.mineralogy.diabase_smooth_brick_wall": "Polierte Ziegelmauer aus Diabas", + "block.mineralogy.diabase_furnace": "Ofen aus Diabas", + "block.mineralogy.diabase_brick_furnace": "Ziegelofen aus Diabas", + "block.mineralogy.diabase_smooth_furnace": "Polierter Ofen aus Diabas", + "block.mineralogy.diabase_smooth_brick_furnace": "Polierter Ziegelofen aus Diabas", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Treppe", - "block.mineralogy.gabbro_slab": "Gabbro Platte", - "block.mineralogy.gabbro_brick": "Gabbro Backstein", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Ziegelsteintreppen", - "block.mineralogy.gabbro_brick_slab": "Gabbro Ziegelplatte", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Polierte Treppe", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Polierte Platte", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Polierter Ziegelstein", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polierte Ziegelsteintreppen", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polierte Ziegelplatte", - "block.mineralogy.gabbro_wall": "Gabbro Wand", - "block.mineralogy.gabbro_brick_wall": "Gabbro Ziegelwand", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Polierte Wand", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Polierte Backsteinmauer", - "block.mineralogy.gabbro_furnace": "Gabbro Ofen", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Ziegelofen", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Polierter Ofen", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Polierter Ziegelofen", + "block.mineralogy.gabbro_stairs": "Treppe aus Gabbro", + "block.mineralogy.gabbro_slab": "Stufe aus Gabbro", + "block.mineralogy.gabbro_brick": "Ziegel aus Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_brick_slab": "Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_smooth": "Polierter Block aus Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Polierte Treppe aus Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Polierte Stufe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Polierte Ziegel aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Polierte Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_wall": "Mauer aus Gabbro", + "block.mineralogy.gabbro_brick_wall": "Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Polierte Mauer aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Polierte Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_furnace": "Ofen aus Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Ziegelofen aus Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Polierter Ofen aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Polierter Ziegelofen aus Gabbro", "block.mineralogy.peridotite": "Peridotit", - "block.mineralogy.peridotite_stairs": "Peridotit Treppe", - "block.mineralogy.peridotite_slab": "Peridotit Platte", - "block.mineralogy.peridotite_brick": "Peridotit Backstein", - "block.mineralogy.peridotite_brick_stairs": "Peridotit Ziegelsteintreppen", - "block.mineralogy.peridotite_brick_slab": "Peridotit Ziegelplatte", - "block.mineralogy.peridotite_smooth": "Polished Peridotit", - "block.mineralogy.peridotite_smooth_stairs": "Peridotit Polierte Treppe", - "block.mineralogy.peridotite_smooth_slab": "Peridotit Polierte Platte", - "block.mineralogy.peridotite_smooth_brick": "Peridotit Polierter Ziegelstein", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotit Polierte Ziegelsteintreppen", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotit Polierte Ziegelplatte", - "block.mineralogy.peridotite_wall": "Peridotit Wand", - "block.mineralogy.peridotite_brick_wall": "Peridotit Ziegelwand", - "block.mineralogy.peridotite_smooth_wall": "Peridotit Polierte Wand", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotit Polierte Backsteinmauer", - "block.mineralogy.peridotite_furnace": "Peridotit Ofen", - "block.mineralogy.peridotite_brick_furnace": "Peridotit Ziegelofen", - "block.mineralogy.peridotite_smooth_furnace": "Peridotit Polierter Ofen", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotit Polierter Ziegelofen", + "block.mineralogy.peridotite_stairs": "Treppe aus Peridotit", + "block.mineralogy.peridotite_slab": "Stufe aus Peridotit", + "block.mineralogy.peridotite_brick": "Ziegel aus Peridotit", + "block.mineralogy.peridotite_brick_stairs": "Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_brick_slab": "Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_smooth": "Polierter Block aus Peridotit", + "block.mineralogy.peridotite_smooth_stairs": "Polierte Treppe aus Peridotit", + "block.mineralogy.peridotite_smooth_slab": "Polierte Stufe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick": "Polierte Ziegel aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_slab": "Polierte Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_wall": "Mauer aus Peridotit", + "block.mineralogy.peridotite_brick_wall": "Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_smooth_wall": "Polierte Mauer aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_wall": "Polierte Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_furnace": "Ofen aus Peridotit", + "block.mineralogy.peridotite_brick_furnace": "Ziegelofen aus Peridotit", + "block.mineralogy.peridotite_smooth_furnace": "Polierter Ofen aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_furnace": "Polierter Ziegelofen aus Peridotit", "block.mineralogy.basaltic_glass": "Basaltglas", - "block.mineralogy.basaltic_glass_stairs": "Basaltglas Treppe", - "block.mineralogy.basaltic_glass_slab": "Basaltglas Platte", - "block.mineralogy.basaltic_glass_brick": "Basaltglas Backstein", - "block.mineralogy.basaltic_glass_brick_stairs": "Basaltglas Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_brick_slab": "Basaltglas Ziegelplatte", - "block.mineralogy.basaltic_glass_smooth": "Polished Basaltglas", - "block.mineralogy.basaltic_glass_smooth_stairs": "Basaltglas Polierte Treppe", - "block.mineralogy.basaltic_glass_smooth_slab": "Basaltglas Polierte Platte", - "block.mineralogy.basaltic_glass_smooth_brick": "Basaltglas Polierter Ziegelstein", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Basaltglas Polierte Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Basaltglas Polierte Ziegelplatte", - "block.mineralogy.basaltic_glass_wall": "Basaltglas Wand", - "block.mineralogy.basaltic_glass_brick_wall": "Basaltglas Ziegelwand", - "block.mineralogy.basaltic_glass_smooth_wall": "Basaltglas Polierte Wand", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Basaltglas Polierte Backsteinmauer", - "block.mineralogy.basaltic_glass_furnace": "Basaltglas Ofen", - "block.mineralogy.basaltic_glass_brick_furnace": "Basaltglas Ziegelofen", - "block.mineralogy.basaltic_glass_smooth_furnace": "Basaltglas Polierter Ofen", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Basaltglas Polierter Ziegelofen", - "block.mineralogy.scoria": "Schlacke", - "block.mineralogy.scoria_stairs": "Schlacke Treppe", - "block.mineralogy.scoria_slab": "Schlacke Platte", - "block.mineralogy.scoria_brick": "Schlacke Backstein", - "block.mineralogy.scoria_brick_stairs": "Schlacke Ziegelsteintreppen", - "block.mineralogy.scoria_brick_slab": "Schlacke Ziegelplatte", - "block.mineralogy.scoria_smooth": "Polished Schlacke", - "block.mineralogy.scoria_smooth_stairs": "Schlacke Polierte Treppe", - "block.mineralogy.scoria_smooth_slab": "Schlacke Polierte Platte", - "block.mineralogy.scoria_smooth_brick": "Schlacke Polierter Ziegelstein", - "block.mineralogy.scoria_smooth_brick_stairs": "Schlacke Polierte Ziegelsteintreppen", - "block.mineralogy.scoria_smooth_brick_slab": "Schlacke Polierte Ziegelplatte", - "block.mineralogy.scoria_wall": "Schlacke Wand", - "block.mineralogy.scoria_brick_wall": "Schlacke Ziegelwand", - "block.mineralogy.scoria_smooth_wall": "Schlacke Polierte Wand", - "block.mineralogy.scoria_smooth_brick_wall": "Schlacke Polierte Backsteinmauer", - "block.mineralogy.scoria_furnace": "Schlacke Ofen", - "block.mineralogy.scoria_brick_furnace": "Schlacke Ziegelofen", - "block.mineralogy.scoria_smooth_furnace": "Schlacke Polierter Ofen", - "block.mineralogy.scoria_smooth_brick_furnace": "Schlacke Polierter Ziegelofen", - "block.mineralogy.tuff": "Tuff", - "block.mineralogy.tuff_stairs": "Tuff Treppe", - "block.mineralogy.tuff_slab": "Tuff Platte", - "block.mineralogy.tuff_brick": "Tuff Backstein", - "block.mineralogy.tuff_brick_stairs": "Tuff Ziegelsteintreppen", - "block.mineralogy.tuff_brick_slab": "Tuff Ziegelplatte", - "block.mineralogy.tuff_smooth": "Polished Tuff", - "block.mineralogy.tuff_smooth_stairs": "Tuff Polierte Treppe", - "block.mineralogy.tuff_smooth_slab": "Tuff Polierte Platte", - "block.mineralogy.tuff_smooth_brick": "Tuff Polierter Ziegelstein", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuff Polierte Ziegelsteintreppen", - "block.mineralogy.tuff_smooth_brick_slab": "Tuff Polierte Ziegelplatte", - "block.mineralogy.tuff_wall": "Tuff Wand", - "block.mineralogy.tuff_brick_wall": "Tuff Ziegelwand", - "block.mineralogy.tuff_smooth_wall": "Tuff Polierte Wand", - "block.mineralogy.tuff_smooth_brick_wall": "Tuff Polierte Backsteinmauer", - "block.mineralogy.tuff_furnace": "Tuff Ofen", - "block.mineralogy.tuff_brick_furnace": "Tuff Ziegelofen", - "block.mineralogy.tuff_smooth_furnace": "Tuff Polierter Ofen", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuff Polierter Ziegelofen", + "block.mineralogy.basaltic_glass_stairs": "Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_slab": "Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick": "Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_stairs": "Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_slab": "Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth": "Polierter Block aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_stairs": "Polierte Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_slab": "Polierte Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick": "Polierte Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Polierte Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_wall": "Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_wall": "Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_wall": "Polierte Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Polierte Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_furnace": "Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_furnace": "Ziegelofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_furnace": "Polierter Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Polierter Ziegelofen aus Basaltglas", + "block.mineralogy.scoria": "Skoria", + "block.mineralogy.scoria_stairs": "Treppe aus Skoria", + "block.mineralogy.scoria_slab": "Stufe aus Skoria", + "block.mineralogy.scoria_brick": "Ziegel aus Skoria", + "block.mineralogy.scoria_brick_stairs": "Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_brick_slab": "Ziegelstufe aus Skoria", + "block.mineralogy.scoria_smooth": "Polierter Block aus Skoria", + "block.mineralogy.scoria_smooth_stairs": "Polierte Treppe aus Skoria", + "block.mineralogy.scoria_smooth_slab": "Polierte Stufe aus Skoria", + "block.mineralogy.scoria_smooth_brick": "Polierte Ziegel aus Skoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Polierte Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_smooth_brick_slab": "Polierte Ziegelstufe aus Skoria", + "block.mineralogy.scoria_wall": "Mauer aus Skoria", + "block.mineralogy.scoria_brick_wall": "Ziegelmauer aus Skoria", + "block.mineralogy.scoria_smooth_wall": "Polierte Mauer aus Skoria", + "block.mineralogy.scoria_smooth_brick_wall": "Polierte Ziegelmauer aus Skoria", + "block.mineralogy.scoria_furnace": "Ofen aus Skoria", + "block.mineralogy.scoria_brick_furnace": "Ziegelofen aus Skoria", + "block.mineralogy.scoria_smooth_furnace": "Polierter Ofen aus Skoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Polierter Ziegelofen aus Skoria", + "block.mineralogy.tuff": "Tuffstein", + "block.mineralogy.tuff_stairs": "Treppe aus Tuffstein", + "block.mineralogy.tuff_slab": "Stufe aus Tuffstein", + "block.mineralogy.tuff_brick": "Ziegel aus Tuffstein", + "block.mineralogy.tuff_brick_stairs": "Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_brick_slab": "Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_smooth": "Polierter Block aus Tuffstein", + "block.mineralogy.tuff_smooth_stairs": "Polierte Treppe aus Tuffstein", + "block.mineralogy.tuff_smooth_slab": "Polierte Stufe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick": "Polierte Ziegel aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_slab": "Polierte Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_wall": "Mauer aus Tuffstein", + "block.mineralogy.tuff_brick_wall": "Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_smooth_wall": "Polierte Mauer aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_wall": "Polierte Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_furnace": "Ofen aus Tuffstein", + "block.mineralogy.tuff_brick_furnace": "Ziegelofen aus Tuffstein", + "block.mineralogy.tuff_smooth_furnace": "Polierter Ofen aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_furnace": "Polierter Ziegelofen aus Tuffstein", "block.mineralogy.siltstone": "Schluffstein", - "block.mineralogy.siltstone_stairs": "Schluffstein Treppe", - "block.mineralogy.siltstone_slab": "Schluffstein Platte", - "block.mineralogy.siltstone_brick": "Schluffstein Backstein", - "block.mineralogy.siltstone_brick_stairs": "Schluffstein Ziegelsteintreppen", - "block.mineralogy.siltstone_brick_slab": "Schluffstein Ziegelplatte", - "block.mineralogy.siltstone_smooth": "Polished Schluffstein", - "block.mineralogy.siltstone_smooth_stairs": "Schluffstein Polierte Treppe", - "block.mineralogy.siltstone_smooth_slab": "Schluffstein Polierte Platte", - "block.mineralogy.siltstone_smooth_brick": "Schluffstein Polierter Ziegelstein", - "block.mineralogy.siltstone_smooth_brick_stairs": "Schluffstein Polierte Ziegelsteintreppen", - "block.mineralogy.siltstone_smooth_brick_slab": "Schluffstein Polierte Ziegelplatte", - "block.mineralogy.siltstone_wall": "Schluffstein Wand", - "block.mineralogy.siltstone_brick_wall": "Schluffstein Ziegelwand", - "block.mineralogy.siltstone_smooth_wall": "Schluffstein Polierte Wand", - "block.mineralogy.siltstone_smooth_brick_wall": "Schluffstein Polierte Backsteinmauer", - "block.mineralogy.siltstone_furnace": "Schluffstein Ofen", - "block.mineralogy.siltstone_brick_furnace": "Schluffstein Ziegelofen", - "block.mineralogy.siltstone_smooth_furnace": "Schluffstein Polierter Ofen", - "block.mineralogy.siltstone_smooth_brick_furnace": "Schluffstein Polierter Ziegelofen", + "block.mineralogy.siltstone_stairs": "Treppe aus Schluffstein", + "block.mineralogy.siltstone_slab": "Stufe aus Schluffstein", + "block.mineralogy.siltstone_brick": "Ziegel aus Schluffstein", + "block.mineralogy.siltstone_brick_stairs": "Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_brick_slab": "Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_smooth": "Polierter Block aus Schluffstein", + "block.mineralogy.siltstone_smooth_stairs": "Polierte Treppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_slab": "Polierte Stufe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick": "Polierte Ziegel aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_slab": "Polierte Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_wall": "Mauer aus Schluffstein", + "block.mineralogy.siltstone_brick_wall": "Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_wall": "Polierte Mauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_wall": "Polierte Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_furnace": "Ofen aus Schluffstein", + "block.mineralogy.siltstone_brick_furnace": "Ziegelofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_furnace": "Polierter Ofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_furnace": "Polierter Ziegelofen aus Schluffstein", "block.mineralogy.rock_salt": "Steinsalz", - "block.mineralogy.rock_salt_stairs": "Steinsalz Treppe", - "block.mineralogy.rock_salt_slab": "Steinsalz Platte", - "block.mineralogy.rock_salt_brick": "Steinsalz Backstein", - "block.mineralogy.rock_salt_brick_stairs": "Steinsalz Ziegelsteintreppen", - "block.mineralogy.rock_salt_brick_slab": "Steinsalz Ziegelplatte", - "block.mineralogy.rock_salt_smooth": "Polished Steinsalz", - "block.mineralogy.rock_salt_smooth_stairs": "Steinsalz Polierte Treppe", - "block.mineralogy.rock_salt_smooth_slab": "Steinsalz Polierte Platte", - "block.mineralogy.rock_salt_smooth_brick": "Steinsalz Polierter Ziegelstein", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Steinsalz Polierte Ziegelsteintreppen", - "block.mineralogy.rock_salt_smooth_brick_slab": "Steinsalz Polierte Ziegelplatte", - "block.mineralogy.rock_salt_wall": "Steinsalz Wand", - "block.mineralogy.rock_salt_brick_wall": "Steinsalz Ziegelwand", - "block.mineralogy.rock_salt_smooth_wall": "Steinsalz Polierte Wand", - "block.mineralogy.rock_salt_smooth_brick_wall": "Steinsalz Polierte Backsteinmauer", - "block.mineralogy.rock_salt_furnace": "Steinsalz Ofen", - "block.mineralogy.rock_salt_brick_furnace": "Steinsalz Ziegelofen", - "block.mineralogy.rock_salt_smooth_furnace": "Steinsalz Polierter Ofen", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Steinsalz Polierter Ziegelofen", + "block.mineralogy.rock_salt_stairs": "Treppe aus Steinsalz", + "block.mineralogy.rock_salt_slab": "Stufe aus Steinsalz", + "block.mineralogy.rock_salt_brick": "Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_brick_stairs": "Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_brick_slab": "Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth": "Polierter Block aus Steinsalz", + "block.mineralogy.rock_salt_smooth_stairs": "Polierte Treppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_slab": "Polierte Stufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick": "Polierte Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_slab": "Polierte Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_wall": "Mauer aus Steinsalz", + "block.mineralogy.rock_salt_brick_wall": "Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_wall": "Polierte Mauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_wall": "Polierte Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_furnace": "Ofen aus Steinsalz", + "block.mineralogy.rock_salt_brick_furnace": "Ziegelofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_furnace": "Polierter Ofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Polierter Ziegelofen aus Steinsalz", "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Treppe", - "block.mineralogy.hornfels_slab": "Hornfels Platte", - "block.mineralogy.hornfels_brick": "Hornfels Backstein", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Ziegelsteintreppen", - "block.mineralogy.hornfels_brick_slab": "Hornfels Ziegelplatte", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Polierte Treppe", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Polierte Platte", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Polierter Ziegelstein", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polierte Ziegelsteintreppen", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polierte Ziegelplatte", - "block.mineralogy.hornfels_wall": "Hornfels Wand", - "block.mineralogy.hornfels_brick_wall": "Hornfels Ziegelwand", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Polierte Wand", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Polierte Backsteinmauer", - "block.mineralogy.hornfels_furnace": "Hornfels Ofen", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Ziegelofen", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Polierter Ofen", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Polierter Ziegelofen", + "block.mineralogy.hornfels_stairs": "Treppe aus Hornfels", + "block.mineralogy.hornfels_slab": "Stufe aus Hornfels", + "block.mineralogy.hornfels_brick": "Ziegel aus Hornfels", + "block.mineralogy.hornfels_brick_stairs": "Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_brick_slab": "Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_smooth": "Polierter Block aus Hornfels", + "block.mineralogy.hornfels_smooth_stairs": "Polierte Treppe aus Hornfels", + "block.mineralogy.hornfels_smooth_slab": "Polierte Stufe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick": "Polierte Ziegel aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_stairs": "Polierte Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_slab": "Polierte Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_wall": "Mauer aus Hornfels", + "block.mineralogy.hornfels_brick_wall": "Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_smooth_wall": "Polierte Mauer aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_wall": "Polierte Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_furnace": "Ofen aus Hornfels", + "block.mineralogy.hornfels_brick_furnace": "Ziegelofen aus Hornfels", + "block.mineralogy.hornfels_smooth_furnace": "Polierter Ofen aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_furnace": "Polierter Ziegelofen aus Hornfels", "block.mineralogy.quartzite": "Quarzit", - "block.mineralogy.quartzite_stairs": "Quarzit Treppe", - "block.mineralogy.quartzite_slab": "Quarzit Platte", - "block.mineralogy.quartzite_brick": "Quarzit Backstein", - "block.mineralogy.quartzite_brick_stairs": "Quarzit Ziegelsteintreppen", - "block.mineralogy.quartzite_brick_slab": "Quarzit Ziegelplatte", - "block.mineralogy.quartzite_smooth": "Polished Quarzit", - "block.mineralogy.quartzite_smooth_stairs": "Quarzit Polierte Treppe", - "block.mineralogy.quartzite_smooth_slab": "Quarzit Polierte Platte", - "block.mineralogy.quartzite_smooth_brick": "Quarzit Polierter Ziegelstein", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quarzit Polierte Ziegelsteintreppen", - "block.mineralogy.quartzite_smooth_brick_slab": "Quarzit Polierte Ziegelplatte", - "block.mineralogy.quartzite_wall": "Quarzit Wand", - "block.mineralogy.quartzite_brick_wall": "Quarzit Ziegelwand", - "block.mineralogy.quartzite_smooth_wall": "Quarzit Polierte Wand", - "block.mineralogy.quartzite_smooth_brick_wall": "Quarzit Polierte Backsteinmauer", - "block.mineralogy.quartzite_furnace": "Quarzit Ofen", - "block.mineralogy.quartzite_brick_furnace": "Quarzit Ziegelofen", - "block.mineralogy.quartzite_smooth_furnace": "Quarzit Polierter Ofen", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quarzit Polierter Ziegelofen", - "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Treppe", - "block.mineralogy.novaculite_slab": "Novaculite Platte", - "block.mineralogy.novaculite_brick": "Novaculite Backstein", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Ziegelsteintreppen", - "block.mineralogy.novaculite_brick_slab": "Novaculite Ziegelplatte", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Polierte Treppe", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Polierte Platte", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Polierter Ziegelstein", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Polierte Ziegelsteintreppen", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Polierte Ziegelplatte", - "block.mineralogy.novaculite_wall": "Novaculite Wand", - "block.mineralogy.novaculite_brick_wall": "Novaculite Ziegelwand", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Polierte Wand", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Polierte Backsteinmauer", - "block.mineralogy.novaculite_furnace": "Novaculite Ofen", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Ziegelofen", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Polierter Ofen", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Polierter Ziegelofen", + "block.mineralogy.quartzite_stairs": "Treppe aus Quarzit", + "block.mineralogy.quartzite_slab": "Stufe aus Quarzit", + "block.mineralogy.quartzite_brick": "Ziegel aus Quarzit", + "block.mineralogy.quartzite_brick_stairs": "Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_brick_slab": "Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_smooth": "Polierter Block aus Quarzit", + "block.mineralogy.quartzite_smooth_stairs": "Polierte Treppe aus Quarzit", + "block.mineralogy.quartzite_smooth_slab": "Polierte Stufe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick": "Polierte Ziegel aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_slab": "Polierte Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_wall": "Mauer aus Quarzit", + "block.mineralogy.quartzite_brick_wall": "Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_smooth_wall": "Polierte Mauer aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_wall": "Polierte Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_furnace": "Ofen aus Quarzit", + "block.mineralogy.quartzite_brick_furnace": "Ziegelofen aus Quarzit", + "block.mineralogy.quartzite_smooth_furnace": "Polierter Ofen aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_furnace": "Polierter Ziegelofen aus Quarzit", + "block.mineralogy.novaculite": "Novakulit", + "block.mineralogy.novaculite_stairs": "Treppe aus Novakulit", + "block.mineralogy.novaculite_slab": "Stufe aus Novakulit", + "block.mineralogy.novaculite_brick": "Ziegel aus Novakulit", + "block.mineralogy.novaculite_brick_stairs": "Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_brick_slab": "Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_smooth": "Polierter Block aus Novakulit", + "block.mineralogy.novaculite_smooth_stairs": "Polierte Treppe aus Novakulit", + "block.mineralogy.novaculite_smooth_slab": "Polierte Stufe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick": "Polierte Ziegel aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_slab": "Polierte Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_wall": "Mauer aus Novakulit", + "block.mineralogy.novaculite_brick_wall": "Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_smooth_wall": "Polierte Mauer aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_wall": "Polierte Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_furnace": "Ofen aus Novakulit", + "block.mineralogy.novaculite_brick_furnace": "Ziegelofen aus Novakulit", + "block.mineralogy.novaculite_smooth_furnace": "Polierter Ofen aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_furnace": "Polierter Ziegelofen aus Novakulit", "block.mineralogy.chalk": "Kreide", - "item.mineralogy.chalk_dust": "Kreide Pulver", + "item.mineralogy.chalk_dust": "Kreidepulver", "item.mineralogy.salt_dust": "Salz", - "item.mineralogy.rock_salt_dust": "Steinsalz-Kristalle", - "block.mineralogy.rocksaltlamp": "Steinsalz-Lampe", + "item.mineralogy.rock_salt_dust": "Steinsalzkristalle", + "block.mineralogy.rocksaltlamp": "Steinsalzlampe", "block.mineralogy.rocksaltstreetlamp": "Steinsalz-Straßenlaterne", - "block.mineralogy.andesite_relief_axe": "Andesit Axe Relief", - "block.mineralogy.andesite_relief_blank": "Andesit Leere Erleichterung", - "block.mineralogy.andesite_relief_cross": "Andesit Cross Relief", - "block.mineralogy.andesite_relief_hammer": "Andesit Hammer Relief", - "block.mineralogy.andesite_relief_hoe": "Andesit Hacke Erleichterung", - "block.mineralogy.andesite_relief_horizontal": "Andesit Horizontales Relief", - "block.mineralogy.andesite_relief_i": "Andesit I Relief", - "block.mineralogy.andesite_relief_left": "Andesit Relief links", - "block.mineralogy.andesite_relief_pickaxe": "Andesit Spitzhacke Relief", - "block.mineralogy.andesite_relief_plus": "Andesit Plus Relief", - "block.mineralogy.andesite_relief_right": "Andesit Rechte Erleichterung", - "block.mineralogy.andesite_relief_sword": "Andesit Schwert Relief", - "block.mineralogy.andesite_relief_vertical": "Andesit Vertikales Relief", - "block.mineralogy.basalt_relief_axe": "Basalt Axe Relief", - "block.mineralogy.basalt_relief_blank": "Basalt Leere Erleichterung", - "block.mineralogy.basalt_relief_cross": "Basalt Cross Relief", - "block.mineralogy.basalt_relief_hammer": "Basalt Hammer Relief", - "block.mineralogy.basalt_relief_hoe": "Basalt Hacke Erleichterung", - "block.mineralogy.basalt_relief_horizontal": "Basalt Horizontales Relief", - "block.mineralogy.basalt_relief_i": "Basalt I Relief", - "block.mineralogy.basalt_relief_left": "Basalt Relief links", - "block.mineralogy.basalt_relief_pickaxe": "Basalt Spitzhacke Relief", - "block.mineralogy.basalt_relief_plus": "Basalt Plus Relief", - "block.mineralogy.basalt_relief_right": "Basalt Rechte Erleichterung", - "block.mineralogy.basalt_relief_sword": "Basalt Schwert Relief", - "block.mineralogy.basalt_relief_vertical": "Basalt Vertikales Relief", - "block.mineralogy.diorite_relief_axe": "Diorit Axe Relief", - "block.mineralogy.diorite_relief_blank": "Diorit Leere Erleichterung", - "block.mineralogy.diorite_relief_cross": "Diorit Cross Relief", - "block.mineralogy.diorite_relief_hammer": "Diorit Hammer Relief", - "block.mineralogy.diorite_relief_hoe": "Diorit Hacke Erleichterung", - "block.mineralogy.diorite_relief_horizontal": "Diorit Horizontales Relief", - "block.mineralogy.diorite_relief_i": "Diorit I Relief", - "block.mineralogy.diorite_relief_left": "Diorit Relief links", - "block.mineralogy.diorite_relief_pickaxe": "Diorit Spitzhacke Relief", - "block.mineralogy.diorite_relief_plus": "Diorit Plus Relief", - "block.mineralogy.diorite_relief_right": "Diorit Rechte Erleichterung", - "block.mineralogy.diorite_relief_sword": "Diorit Schwert Relief", - "block.mineralogy.diorite_relief_vertical": "Diorit Vertikales Relief", - "block.mineralogy.granite_relief_axe": "Granit Axe Relief", - "block.mineralogy.granite_relief_blank": "Granit Leere Erleichterung", - "block.mineralogy.granite_relief_cross": "Granit Cross Relief", - "block.mineralogy.granite_relief_hammer": "Granit Hammer Relief", - "block.mineralogy.granite_relief_hoe": "Granit Hacke Erleichterung", - "block.mineralogy.granite_relief_horizontal": "Granit Horizontales Relief", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief links", - "block.mineralogy.granite_relief_pickaxe": "Granit Spitzhacke Relief", - "block.mineralogy.granite_relief_plus": "Granit Plus Relief", - "block.mineralogy.granite_relief_right": "Granit Rechte Erleichterung", - "block.mineralogy.granite_relief_sword": "Granit Schwert Relief", - "block.mineralogy.granite_relief_vertical": "Granit Vertikales Relief", - "block.mineralogy.rhyolite_relief_axe": "Rhyolith Axe Relief", - "block.mineralogy.rhyolite_relief_blank": "Rhyolith Leere Erleichterung", - "block.mineralogy.rhyolite_relief_cross": "Rhyolith Cross Relief", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolith Hammer Relief", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolith Hacke Erleichterung", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolith Horizontales Relief", - "block.mineralogy.rhyolite_relief_i": "Rhyolith I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolith Relief links", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolith Spitzhacke Relief", - "block.mineralogy.rhyolite_relief_plus": "Rhyolith Plus Relief", - "block.mineralogy.rhyolite_relief_right": "Rhyolith Rechte Erleichterung", - "block.mineralogy.rhyolite_relief_sword": "Rhyolith Schwert Relief", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolith Vertikales Relief", - "block.mineralogy.pegmatite_relief_axe": "Pegmatit Axe Relief", - "block.mineralogy.pegmatite_relief_blank": "Pegmatit Leere Erleichterung", - "block.mineralogy.pegmatite_relief_cross": "Pegmatit Cross Relief", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatit Hammer Relief", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatit Hacke Erleichterung", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatit Horizontales Relief", - "block.mineralogy.pegmatite_relief_i": "Pegmatit I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatit Relief links", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatit Spitzhacke Relief", - "block.mineralogy.pegmatite_relief_plus": "Pegmatit Plus Relief", - "block.mineralogy.pegmatite_relief_right": "Pegmatit Rechte Erleichterung", - "block.mineralogy.pegmatite_relief_sword": "Pegmatit Schwert Relief", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatit Vertikales Relief", - "block.mineralogy.shale_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.shale_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.shale_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.shale_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.shale_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.shale_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.shale_relief_i": "Schiefer I Relief", - "block.mineralogy.shale_relief_left": "Schiefer Relief links", - "block.mineralogy.shale_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.shale_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.shale_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.shale_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.shale_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.conglomerate_relief_axe": "Konglomerat Axe Relief", - "block.mineralogy.conglomerate_relief_blank": "Konglomerat Leere Erleichterung", - "block.mineralogy.conglomerate_relief_cross": "Konglomerat Cross Relief", - "block.mineralogy.conglomerate_relief_hammer": "Konglomerat Hammer Relief", - "block.mineralogy.conglomerate_relief_hoe": "Konglomerat Hacke Erleichterung", - "block.mineralogy.conglomerate_relief_horizontal": "Konglomerat Horizontales Relief", - "block.mineralogy.conglomerate_relief_i": "Konglomerat I Relief", - "block.mineralogy.conglomerate_relief_left": "Konglomerat Relief links", - "block.mineralogy.conglomerate_relief_pickaxe": "Konglomerat Spitzhacke Relief", - "block.mineralogy.conglomerate_relief_plus": "Konglomerat Plus Relief", - "block.mineralogy.conglomerate_relief_right": "Konglomerat Rechte Erleichterung", - "block.mineralogy.conglomerate_relief_sword": "Konglomerat Schwert Relief", - "block.mineralogy.conglomerate_relief_vertical": "Konglomerat Vertikales Relief", - "block.mineralogy.dolomite_relief_axe": "Dolomit Axe Relief", - "block.mineralogy.dolomite_relief_blank": "Dolomit Leere Erleichterung", - "block.mineralogy.dolomite_relief_cross": "Dolomit Cross Relief", - "block.mineralogy.dolomite_relief_hammer": "Dolomit Hammer Relief", - "block.mineralogy.dolomite_relief_hoe": "Dolomit Hacke Erleichterung", - "block.mineralogy.dolomite_relief_horizontal": "Dolomit Horizontales Relief", - "block.mineralogy.dolomite_relief_i": "Dolomit I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomit Relief links", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomit Spitzhacke Relief", - "block.mineralogy.dolomite_relief_plus": "Dolomit Plus Relief", - "block.mineralogy.dolomite_relief_right": "Dolomit Rechte Erleichterung", - "block.mineralogy.dolomite_relief_sword": "Dolomit Schwert Relief", - "block.mineralogy.dolomite_relief_vertical": "Dolomit Vertikales Relief", - "block.mineralogy.limestone_relief_axe": "Kalkstein Axe Relief", - "block.mineralogy.limestone_relief_blank": "Kalkstein Leere Erleichterung", - "block.mineralogy.limestone_relief_cross": "Kalkstein Cross Relief", - "block.mineralogy.limestone_relief_hammer": "Kalkstein Hammer Relief", - "block.mineralogy.limestone_relief_hoe": "Kalkstein Hacke Erleichterung", - "block.mineralogy.limestone_relief_horizontal": "Kalkstein Horizontales Relief", - "block.mineralogy.limestone_relief_i": "Kalkstein I Relief", - "block.mineralogy.limestone_relief_left": "Kalkstein Relief links", - "block.mineralogy.limestone_relief_pickaxe": "Kalkstein Spitzhacke Relief", - "block.mineralogy.limestone_relief_plus": "Kalkstein Plus Relief", - "block.mineralogy.limestone_relief_right": "Kalkstein Rechte Erleichterung", - "block.mineralogy.limestone_relief_sword": "Kalkstein Schwert Relief", - "block.mineralogy.limestone_relief_vertical": "Kalkstein Vertikales Relief", - "block.mineralogy.marble_relief_axe": "Marmor Axe Relief", - "block.mineralogy.marble_relief_blank": "Marmor Leere Erleichterung", - "block.mineralogy.marble_relief_cross": "Marmor Cross Relief", - "block.mineralogy.marble_relief_hammer": "Marmor Hammer Relief", - "block.mineralogy.marble_relief_hoe": "Marmor Hacke Erleichterung", - "block.mineralogy.marble_relief_horizontal": "Marmor Horizontales Relief", - "block.mineralogy.marble_relief_i": "Marmor I Relief", - "block.mineralogy.marble_relief_left": "Marmor Relief links", - "block.mineralogy.marble_relief_pickaxe": "Marmor Spitzhacke Relief", - "block.mineralogy.marble_relief_plus": "Marmor Plus Relief", - "block.mineralogy.marble_relief_right": "Marmor Rechte Erleichterung", - "block.mineralogy.marble_relief_sword": "Marmor Schwert Relief", - "block.mineralogy.marble_relief_vertical": "Marmor Vertikales Relief", - "block.mineralogy.slate_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.slate_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.slate_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.slate_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.slate_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.slate_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.slate_relief_i": "Schiefer I Relief", - "block.mineralogy.slate_relief_left": "Schiefer Relief links", - "block.mineralogy.slate_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.slate_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.slate_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.slate_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.slate_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.schist_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.schist_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.schist_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.schist_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.schist_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.schist_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.schist_relief_i": "Schiefer I Relief", - "block.mineralogy.schist_relief_left": "Schiefer Relief links", - "block.mineralogy.schist_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.schist_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.schist_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.schist_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.schist_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.gneiss_relief_axe": "Gneis Axe Relief", - "block.mineralogy.gneiss_relief_blank": "Gneis Leere Erleichterung", - "block.mineralogy.gneiss_relief_cross": "Gneis Cross Relief", - "block.mineralogy.gneiss_relief_hammer": "Gneis Hammer Relief", - "block.mineralogy.gneiss_relief_hoe": "Gneis Hacke Erleichterung", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Horizontales Relief", - "block.mineralogy.gneiss_relief_i": "Gneis I Relief", - "block.mineralogy.gneiss_relief_left": "Gneis Relief links", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Spitzhacke Relief", - "block.mineralogy.gneiss_relief_plus": "Gneis Plus Relief", - "block.mineralogy.gneiss_relief_right": "Gneis Rechte Erleichterung", - "block.mineralogy.gneiss_relief_sword": "Gneis Schwert Relief", - "block.mineralogy.gneiss_relief_vertical": "Gneis Vertikales Relief", - "block.mineralogy.phyllite_relief_axe": "Phyllite Axe Relief", - "block.mineralogy.phyllite_relief_blank": "Phyllite Leere Erleichterung", - "block.mineralogy.phyllite_relief_cross": "Phyllite Cross Relief", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Hammer Relief", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hacke Erleichterung", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Horizontales Relief", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief links", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Spitzhacke Relief", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus Relief", - "block.mineralogy.phyllite_relief_right": "Phyllite Rechte Erleichterung", - "block.mineralogy.phyllite_relief_sword": "Phyllite Schwert Relief", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Vertikales Relief", - "block.mineralogy.amphibolite_relief_axe": "Amphibolith Axe Relief", - "block.mineralogy.amphibolite_relief_blank": "Amphibolith Leere Erleichterung", - "block.mineralogy.amphibolite_relief_cross": "Amphibolith Cross Relief", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolith Hammer Relief", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolith Hacke Erleichterung", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolith Horizontales Relief", - "block.mineralogy.amphibolite_relief_i": "Amphibolith I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolith Relief links", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolith Spitzhacke Relief", - "block.mineralogy.amphibolite_relief_plus": "Amphibolith Plus Relief", - "block.mineralogy.amphibolite_relief_right": "Amphibolith Rechte Erleichterung", - "block.mineralogy.amphibolite_relief_sword": "Amphibolith Schwert Relief", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolith Vertikales Relief", - "block.mineralogy.diabase_relief_axe": "Diabas Axe Relief", - "block.mineralogy.diabase_relief_blank": "Diabas Leere Erleichterung", - "block.mineralogy.diabase_relief_cross": "Diabas Cross Relief", - "block.mineralogy.diabase_relief_hammer": "Diabas Hammer Relief", - "block.mineralogy.diabase_relief_hoe": "Diabas Hacke Erleichterung", - "block.mineralogy.diabase_relief_horizontal": "Diabas Horizontales Relief", - "block.mineralogy.diabase_relief_i": "Diabas I Relief", - "block.mineralogy.diabase_relief_left": "Diabas Relief links", - "block.mineralogy.diabase_relief_pickaxe": "Diabas Spitzhacke Relief", - "block.mineralogy.diabase_relief_plus": "Diabas Plus Relief", - "block.mineralogy.diabase_relief_right": "Diabas Rechte Erleichterung", - "block.mineralogy.diabase_relief_sword": "Diabas Schwert Relief", - "block.mineralogy.diabase_relief_vertical": "Diabas Vertikales Relief", - "block.mineralogy.gabbro_relief_axe": "Gabbro Axe Relief", - "block.mineralogy.gabbro_relief_blank": "Gabbro Leere Erleichterung", - "block.mineralogy.gabbro_relief_cross": "Gabbro Cross Relief", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Hammer Relief", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hacke Erleichterung", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Horizontales Relief", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief links", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Spitzhacke Relief", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus Relief", - "block.mineralogy.gabbro_relief_right": "Gabbro Rechte Erleichterung", - "block.mineralogy.gabbro_relief_sword": "Gabbro Schwert Relief", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Vertikales Relief", - "block.mineralogy.peridotite_relief_axe": "Peridotit Axe Relief", - "block.mineralogy.peridotite_relief_blank": "Peridotit Leere Erleichterung", - "block.mineralogy.peridotite_relief_cross": "Peridotit Cross Relief", - "block.mineralogy.peridotite_relief_hammer": "Peridotit Hammer Relief", - "block.mineralogy.peridotite_relief_hoe": "Peridotit Hacke Erleichterung", - "block.mineralogy.peridotite_relief_horizontal": "Peridotit Horizontales Relief", - "block.mineralogy.peridotite_relief_i": "Peridotit I Relief", - "block.mineralogy.peridotite_relief_left": "Peridotit Relief links", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotit Spitzhacke Relief", - "block.mineralogy.peridotite_relief_plus": "Peridotit Plus Relief", - "block.mineralogy.peridotite_relief_right": "Peridotit Rechte Erleichterung", - "block.mineralogy.peridotite_relief_sword": "Peridotit Schwert Relief", - "block.mineralogy.peridotite_relief_vertical": "Peridotit Vertikales Relief", - "block.mineralogy.basaltic_glass_relief_axe": "Basaltglas Axe Relief", - "block.mineralogy.basaltic_glass_relief_blank": "Basaltglas Leere Erleichterung", - "block.mineralogy.basaltic_glass_relief_cross": "Basaltglas Cross Relief", - "block.mineralogy.basaltic_glass_relief_hammer": "Basaltglas Hammer Relief", - "block.mineralogy.basaltic_glass_relief_hoe": "Basaltglas Hacke Erleichterung", - "block.mineralogy.basaltic_glass_relief_horizontal": "Basaltglas Horizontales Relief", - "block.mineralogy.basaltic_glass_relief_i": "Basaltglas I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Basaltglas Relief links", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Basaltglas Spitzhacke Relief", - "block.mineralogy.basaltic_glass_relief_plus": "Basaltglas Plus Relief", - "block.mineralogy.basaltic_glass_relief_right": "Basaltglas Rechte Erleichterung", - "block.mineralogy.basaltic_glass_relief_sword": "Basaltglas Schwert Relief", - "block.mineralogy.basaltic_glass_relief_vertical": "Basaltglas Vertikales Relief", - "block.mineralogy.scoria_relief_axe": "Schlacke Axe Relief", - "block.mineralogy.scoria_relief_blank": "Schlacke Leere Erleichterung", - "block.mineralogy.scoria_relief_cross": "Schlacke Cross Relief", - "block.mineralogy.scoria_relief_hammer": "Schlacke Hammer Relief", - "block.mineralogy.scoria_relief_hoe": "Schlacke Hacke Erleichterung", - "block.mineralogy.scoria_relief_horizontal": "Schlacke Horizontales Relief", - "block.mineralogy.scoria_relief_i": "Schlacke I Relief", - "block.mineralogy.scoria_relief_left": "Schlacke Relief links", - "block.mineralogy.scoria_relief_pickaxe": "Schlacke Spitzhacke Relief", - "block.mineralogy.scoria_relief_plus": "Schlacke Plus Relief", - "block.mineralogy.scoria_relief_right": "Schlacke Rechte Erleichterung", - "block.mineralogy.scoria_relief_sword": "Schlacke Schwert Relief", - "block.mineralogy.scoria_relief_vertical": "Schlacke Vertikales Relief", - "block.mineralogy.tuff_relief_axe": "Tuff Axe Relief", - "block.mineralogy.tuff_relief_blank": "Tuff Leere Erleichterung", - "block.mineralogy.tuff_relief_cross": "Tuff Cross Relief", - "block.mineralogy.tuff_relief_hammer": "Tuff Hammer Relief", - "block.mineralogy.tuff_relief_hoe": "Tuff Hacke Erleichterung", - "block.mineralogy.tuff_relief_horizontal": "Tuff Horizontales Relief", - "block.mineralogy.tuff_relief_i": "Tuff I Relief", - "block.mineralogy.tuff_relief_left": "Tuff Relief links", - "block.mineralogy.tuff_relief_pickaxe": "Tuff Spitzhacke Relief", - "block.mineralogy.tuff_relief_plus": "Tuff Plus Relief", - "block.mineralogy.tuff_relief_right": "Tuff Rechte Erleichterung", - "block.mineralogy.tuff_relief_sword": "Tuff Schwert Relief", - "block.mineralogy.tuff_relief_vertical": "Tuff Vertikales Relief", - "block.mineralogy.siltstone_relief_axe": "Schluffstein Axe Relief", - "block.mineralogy.siltstone_relief_blank": "Schluffstein Leere Erleichterung", - "block.mineralogy.siltstone_relief_cross": "Schluffstein Cross Relief", - "block.mineralogy.siltstone_relief_hammer": "Schluffstein Hammer Relief", - "block.mineralogy.siltstone_relief_hoe": "Schluffstein Hacke Erleichterung", - "block.mineralogy.siltstone_relief_horizontal": "Schluffstein Horizontales Relief", - "block.mineralogy.siltstone_relief_i": "Schluffstein I Relief", - "block.mineralogy.siltstone_relief_left": "Schluffstein Relief links", - "block.mineralogy.siltstone_relief_pickaxe": "Schluffstein Spitzhacke Relief", - "block.mineralogy.siltstone_relief_plus": "Schluffstein Plus Relief", - "block.mineralogy.siltstone_relief_right": "Schluffstein Rechte Erleichterung", - "block.mineralogy.siltstone_relief_sword": "Schluffstein Schwert Relief", - "block.mineralogy.siltstone_relief_vertical": "Schluffstein Vertikales Relief", - "block.mineralogy.rock_salt_relief_axe": "Steinsalz Axe Relief", - "block.mineralogy.rock_salt_relief_blank": "Steinsalz Leere Erleichterung", - "block.mineralogy.rock_salt_relief_cross": "Steinsalz Cross Relief", - "block.mineralogy.rock_salt_relief_hammer": "Steinsalz Hammer Relief", - "block.mineralogy.rock_salt_relief_hoe": "Steinsalz Hacke Erleichterung", - "block.mineralogy.rock_salt_relief_horizontal": "Steinsalz Horizontales Relief", - "block.mineralogy.rock_salt_relief_i": "Steinsalz I Relief", - "block.mineralogy.rock_salt_relief_left": "Steinsalz Relief links", - "block.mineralogy.rock_salt_relief_pickaxe": "Steinsalz Spitzhacke Relief", - "block.mineralogy.rock_salt_relief_plus": "Steinsalz Plus Relief", - "block.mineralogy.rock_salt_relief_right": "Steinsalz Rechte Erleichterung", - "block.mineralogy.rock_salt_relief_sword": "Steinsalz Schwert Relief", - "block.mineralogy.rock_salt_relief_vertical": "Steinsalz Vertikales Relief", - "block.mineralogy.hornfels_relief_axe": "Hornfels Axe Relief", - "block.mineralogy.hornfels_relief_blank": "Hornfels Leere Erleichterung", - "block.mineralogy.hornfels_relief_cross": "Hornfels Cross Relief", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Hammer Relief", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hacke Erleichterung", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Horizontales Relief", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief links", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Spitzhacke Relief", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus Relief", - "block.mineralogy.hornfels_relief_right": "Hornfels Rechte Erleichterung", - "block.mineralogy.hornfels_relief_sword": "Hornfels Schwert Relief", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Vertikales Relief", - "block.mineralogy.quartzite_relief_axe": "Quarzit Axe Relief", - "block.mineralogy.quartzite_relief_blank": "Quarzit Leere Erleichterung", - "block.mineralogy.quartzite_relief_cross": "Quarzit Cross Relief", - "block.mineralogy.quartzite_relief_hammer": "Quarzit Hammer Relief", - "block.mineralogy.quartzite_relief_hoe": "Quarzit Hacke Erleichterung", - "block.mineralogy.quartzite_relief_horizontal": "Quarzit Horizontales Relief", - "block.mineralogy.quartzite_relief_i": "Quarzit I Relief", - "block.mineralogy.quartzite_relief_left": "Quarzit Relief links", - "block.mineralogy.quartzite_relief_pickaxe": "Quarzit Spitzhacke Relief", - "block.mineralogy.quartzite_relief_plus": "Quarzit Plus Relief", - "block.mineralogy.quartzite_relief_right": "Quarzit Rechte Erleichterung", - "block.mineralogy.quartzite_relief_sword": "Quarzit Schwert Relief", - "block.mineralogy.quartzite_relief_vertical": "Quarzit Vertikales Relief", - "block.mineralogy.novaculite_relief_axe": "Novaculite Axe Relief", - "block.mineralogy.novaculite_relief_blank": "Novaculite Leere Erleichterung", - "block.mineralogy.novaculite_relief_cross": "Novaculite Cross Relief", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Hammer Relief", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hacke Erleichterung", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Horizontales Relief", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief links", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Spitzhacke Relief", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus Relief", - "block.mineralogy.novaculite_relief_right": "Novaculite Rechte Erleichterung", - "block.mineralogy.novaculite_relief_sword": "Novaculite Schwert Relief", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertikales Relief", - "advancements.mineralogy.all_the_rocks.title": "Nennen Sie die Felsen Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, Sie haben alle gängigen Gesteinsarten in der Mineralogie gefunden!", - "fluid.mineralogy.crude_oil": "Rohöl", - "block.mineralogy.crude_oil": "Rohöl", - "item.mineralogy.crude_oil_bucket": "Rohöleimer", + "block.mineralogy.andesite_relief_axe": "Relief aus Andesit (Axt)", + "block.mineralogy.andesite_relief_blank": "Relief aus Andesit (ohne Motiv)", + "block.mineralogy.andesite_relief_cross": "Relief aus Andesit (Kreuz)", + "block.mineralogy.andesite_relief_hammer": "Relief aus Andesit (Hammer)", + "block.mineralogy.andesite_relief_hoe": "Relief aus Andesit (Hacke)", + "block.mineralogy.andesite_relief_horizontal": "Relief aus Andesit (waagerecht)", + "block.mineralogy.andesite_relief_i": "Relief aus Andesit (I)", + "block.mineralogy.andesite_relief_left": "Relief aus Andesit (links)", + "block.mineralogy.andesite_relief_pickaxe": "Relief aus Andesit (Spitzhacke)", + "block.mineralogy.andesite_relief_plus": "Relief aus Andesit (Pluszeichen)", + "block.mineralogy.andesite_relief_right": "Relief aus Andesit (rechts)", + "block.mineralogy.andesite_relief_sword": "Relief aus Andesit (Schwert)", + "block.mineralogy.andesite_relief_vertical": "Relief aus Andesit (senkrecht)", + "block.mineralogy.basalt_relief_axe": "Relief aus Basalt (Axt)", + "block.mineralogy.basalt_relief_blank": "Relief aus Basalt (ohne Motiv)", + "block.mineralogy.basalt_relief_cross": "Relief aus Basalt (Kreuz)", + "block.mineralogy.basalt_relief_hammer": "Relief aus Basalt (Hammer)", + "block.mineralogy.basalt_relief_hoe": "Relief aus Basalt (Hacke)", + "block.mineralogy.basalt_relief_horizontal": "Relief aus Basalt (waagerecht)", + "block.mineralogy.basalt_relief_i": "Relief aus Basalt (I)", + "block.mineralogy.basalt_relief_left": "Relief aus Basalt (links)", + "block.mineralogy.basalt_relief_pickaxe": "Relief aus Basalt (Spitzhacke)", + "block.mineralogy.basalt_relief_plus": "Relief aus Basalt (Pluszeichen)", + "block.mineralogy.basalt_relief_right": "Relief aus Basalt (rechts)", + "block.mineralogy.basalt_relief_sword": "Relief aus Basalt (Schwert)", + "block.mineralogy.basalt_relief_vertical": "Relief aus Basalt (senkrecht)", + "block.mineralogy.diorite_relief_axe": "Relief aus Diorit (Axt)", + "block.mineralogy.diorite_relief_blank": "Relief aus Diorit (ohne Motiv)", + "block.mineralogy.diorite_relief_cross": "Relief aus Diorit (Kreuz)", + "block.mineralogy.diorite_relief_hammer": "Relief aus Diorit (Hammer)", + "block.mineralogy.diorite_relief_hoe": "Relief aus Diorit (Hacke)", + "block.mineralogy.diorite_relief_horizontal": "Relief aus Diorit (waagerecht)", + "block.mineralogy.diorite_relief_i": "Relief aus Diorit (I)", + "block.mineralogy.diorite_relief_left": "Relief aus Diorit (links)", + "block.mineralogy.diorite_relief_pickaxe": "Relief aus Diorit (Spitzhacke)", + "block.mineralogy.diorite_relief_plus": "Relief aus Diorit (Pluszeichen)", + "block.mineralogy.diorite_relief_right": "Relief aus Diorit (rechts)", + "block.mineralogy.diorite_relief_sword": "Relief aus Diorit (Schwert)", + "block.mineralogy.diorite_relief_vertical": "Relief aus Diorit (senkrecht)", + "block.mineralogy.granite_relief_axe": "Relief aus Granit (Axt)", + "block.mineralogy.granite_relief_blank": "Relief aus Granit (ohne Motiv)", + "block.mineralogy.granite_relief_cross": "Relief aus Granit (Kreuz)", + "block.mineralogy.granite_relief_hammer": "Relief aus Granit (Hammer)", + "block.mineralogy.granite_relief_hoe": "Relief aus Granit (Hacke)", + "block.mineralogy.granite_relief_horizontal": "Relief aus Granit (waagerecht)", + "block.mineralogy.granite_relief_i": "Relief aus Granit (I)", + "block.mineralogy.granite_relief_left": "Relief aus Granit (links)", + "block.mineralogy.granite_relief_pickaxe": "Relief aus Granit (Spitzhacke)", + "block.mineralogy.granite_relief_plus": "Relief aus Granit (Pluszeichen)", + "block.mineralogy.granite_relief_right": "Relief aus Granit (rechts)", + "block.mineralogy.granite_relief_sword": "Relief aus Granit (Schwert)", + "block.mineralogy.granite_relief_vertical": "Relief aus Granit (senkrecht)", + "block.mineralogy.rhyolite_relief_axe": "Relief aus Rhyolith (Axt)", + "block.mineralogy.rhyolite_relief_blank": "Relief aus Rhyolith (ohne Motiv)", + "block.mineralogy.rhyolite_relief_cross": "Relief aus Rhyolith (Kreuz)", + "block.mineralogy.rhyolite_relief_hammer": "Relief aus Rhyolith (Hammer)", + "block.mineralogy.rhyolite_relief_hoe": "Relief aus Rhyolith (Hacke)", + "block.mineralogy.rhyolite_relief_horizontal": "Relief aus Rhyolith (waagerecht)", + "block.mineralogy.rhyolite_relief_i": "Relief aus Rhyolith (I)", + "block.mineralogy.rhyolite_relief_left": "Relief aus Rhyolith (links)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relief aus Rhyolith (Spitzhacke)", + "block.mineralogy.rhyolite_relief_plus": "Relief aus Rhyolith (Pluszeichen)", + "block.mineralogy.rhyolite_relief_right": "Relief aus Rhyolith (rechts)", + "block.mineralogy.rhyolite_relief_sword": "Relief aus Rhyolith (Schwert)", + "block.mineralogy.rhyolite_relief_vertical": "Relief aus Rhyolith (senkrecht)", + "block.mineralogy.pegmatite_relief_axe": "Relief aus Pegmatit (Axt)", + "block.mineralogy.pegmatite_relief_blank": "Relief aus Pegmatit (ohne Motiv)", + "block.mineralogy.pegmatite_relief_cross": "Relief aus Pegmatit (Kreuz)", + "block.mineralogy.pegmatite_relief_hammer": "Relief aus Pegmatit (Hammer)", + "block.mineralogy.pegmatite_relief_hoe": "Relief aus Pegmatit (Hacke)", + "block.mineralogy.pegmatite_relief_horizontal": "Relief aus Pegmatit (waagerecht)", + "block.mineralogy.pegmatite_relief_i": "Relief aus Pegmatit (I)", + "block.mineralogy.pegmatite_relief_left": "Relief aus Pegmatit (links)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relief aus Pegmatit (Spitzhacke)", + "block.mineralogy.pegmatite_relief_plus": "Relief aus Pegmatit (Pluszeichen)", + "block.mineralogy.pegmatite_relief_right": "Relief aus Pegmatit (rechts)", + "block.mineralogy.pegmatite_relief_sword": "Relief aus Pegmatit (Schwert)", + "block.mineralogy.pegmatite_relief_vertical": "Relief aus Pegmatit (senkrecht)", + "block.mineralogy.shale_relief_axe": "Relief aus Tonschiefer (Axt)", + "block.mineralogy.shale_relief_blank": "Relief aus Tonschiefer (ohne Motiv)", + "block.mineralogy.shale_relief_cross": "Relief aus Tonschiefer (Kreuz)", + "block.mineralogy.shale_relief_hammer": "Relief aus Tonschiefer (Hammer)", + "block.mineralogy.shale_relief_hoe": "Relief aus Tonschiefer (Hacke)", + "block.mineralogy.shale_relief_horizontal": "Relief aus Tonschiefer (waagerecht)", + "block.mineralogy.shale_relief_i": "Relief aus Tonschiefer (I)", + "block.mineralogy.shale_relief_left": "Relief aus Tonschiefer (links)", + "block.mineralogy.shale_relief_pickaxe": "Relief aus Tonschiefer (Spitzhacke)", + "block.mineralogy.shale_relief_plus": "Relief aus Tonschiefer (Pluszeichen)", + "block.mineralogy.shale_relief_right": "Relief aus Tonschiefer (rechts)", + "block.mineralogy.shale_relief_sword": "Relief aus Tonschiefer (Schwert)", + "block.mineralogy.shale_relief_vertical": "Relief aus Tonschiefer (senkrecht)", + "block.mineralogy.conglomerate_relief_axe": "Relief aus Konglomerat (Axt)", + "block.mineralogy.conglomerate_relief_blank": "Relief aus Konglomerat (ohne Motiv)", + "block.mineralogy.conglomerate_relief_cross": "Relief aus Konglomerat (Kreuz)", + "block.mineralogy.conglomerate_relief_hammer": "Relief aus Konglomerat (Hammer)", + "block.mineralogy.conglomerate_relief_hoe": "Relief aus Konglomerat (Hacke)", + "block.mineralogy.conglomerate_relief_horizontal": "Relief aus Konglomerat (waagerecht)", + "block.mineralogy.conglomerate_relief_i": "Relief aus Konglomerat (I)", + "block.mineralogy.conglomerate_relief_left": "Relief aus Konglomerat (links)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relief aus Konglomerat (Spitzhacke)", + "block.mineralogy.conglomerate_relief_plus": "Relief aus Konglomerat (Pluszeichen)", + "block.mineralogy.conglomerate_relief_right": "Relief aus Konglomerat (rechts)", + "block.mineralogy.conglomerate_relief_sword": "Relief aus Konglomerat (Schwert)", + "block.mineralogy.conglomerate_relief_vertical": "Relief aus Konglomerat (senkrecht)", + "block.mineralogy.dolomite_relief_axe": "Relief aus Dolomit (Axt)", + "block.mineralogy.dolomite_relief_blank": "Relief aus Dolomit (ohne Motiv)", + "block.mineralogy.dolomite_relief_cross": "Relief aus Dolomit (Kreuz)", + "block.mineralogy.dolomite_relief_hammer": "Relief aus Dolomit (Hammer)", + "block.mineralogy.dolomite_relief_hoe": "Relief aus Dolomit (Hacke)", + "block.mineralogy.dolomite_relief_horizontal": "Relief aus Dolomit (waagerecht)", + "block.mineralogy.dolomite_relief_i": "Relief aus Dolomit (I)", + "block.mineralogy.dolomite_relief_left": "Relief aus Dolomit (links)", + "block.mineralogy.dolomite_relief_pickaxe": "Relief aus Dolomit (Spitzhacke)", + "block.mineralogy.dolomite_relief_plus": "Relief aus Dolomit (Pluszeichen)", + "block.mineralogy.dolomite_relief_right": "Relief aus Dolomit (rechts)", + "block.mineralogy.dolomite_relief_sword": "Relief aus Dolomit (Schwert)", + "block.mineralogy.dolomite_relief_vertical": "Relief aus Dolomit (senkrecht)", + "block.mineralogy.limestone_relief_axe": "Relief aus Kalkstein (Axt)", + "block.mineralogy.limestone_relief_blank": "Relief aus Kalkstein (ohne Motiv)", + "block.mineralogy.limestone_relief_cross": "Relief aus Kalkstein (Kreuz)", + "block.mineralogy.limestone_relief_hammer": "Relief aus Kalkstein (Hammer)", + "block.mineralogy.limestone_relief_hoe": "Relief aus Kalkstein (Hacke)", + "block.mineralogy.limestone_relief_horizontal": "Relief aus Kalkstein (waagerecht)", + "block.mineralogy.limestone_relief_i": "Relief aus Kalkstein (I)", + "block.mineralogy.limestone_relief_left": "Relief aus Kalkstein (links)", + "block.mineralogy.limestone_relief_pickaxe": "Relief aus Kalkstein (Spitzhacke)", + "block.mineralogy.limestone_relief_plus": "Relief aus Kalkstein (Pluszeichen)", + "block.mineralogy.limestone_relief_right": "Relief aus Kalkstein (rechts)", + "block.mineralogy.limestone_relief_sword": "Relief aus Kalkstein (Schwert)", + "block.mineralogy.limestone_relief_vertical": "Relief aus Kalkstein (senkrecht)", + "block.mineralogy.marble_relief_axe": "Relief aus Marmor (Axt)", + "block.mineralogy.marble_relief_blank": "Relief aus Marmor (ohne Motiv)", + "block.mineralogy.marble_relief_cross": "Relief aus Marmor (Kreuz)", + "block.mineralogy.marble_relief_hammer": "Relief aus Marmor (Hammer)", + "block.mineralogy.marble_relief_hoe": "Relief aus Marmor (Hacke)", + "block.mineralogy.marble_relief_horizontal": "Relief aus Marmor (waagerecht)", + "block.mineralogy.marble_relief_i": "Relief aus Marmor (I)", + "block.mineralogy.marble_relief_left": "Relief aus Marmor (links)", + "block.mineralogy.marble_relief_pickaxe": "Relief aus Marmor (Spitzhacke)", + "block.mineralogy.marble_relief_plus": "Relief aus Marmor (Pluszeichen)", + "block.mineralogy.marble_relief_right": "Relief aus Marmor (rechts)", + "block.mineralogy.marble_relief_sword": "Relief aus Marmor (Schwert)", + "block.mineralogy.marble_relief_vertical": "Relief aus Marmor (senkrecht)", + "block.mineralogy.slate_relief_axe": "Relief aus Schiefer (Axt)", + "block.mineralogy.slate_relief_blank": "Relief aus Schiefer (ohne Motiv)", + "block.mineralogy.slate_relief_cross": "Relief aus Schiefer (Kreuz)", + "block.mineralogy.slate_relief_hammer": "Relief aus Schiefer (Hammer)", + "block.mineralogy.slate_relief_hoe": "Relief aus Schiefer (Hacke)", + "block.mineralogy.slate_relief_horizontal": "Relief aus Schiefer (waagerecht)", + "block.mineralogy.slate_relief_i": "Relief aus Schiefer (I)", + "block.mineralogy.slate_relief_left": "Relief aus Schiefer (links)", + "block.mineralogy.slate_relief_pickaxe": "Relief aus Schiefer (Spitzhacke)", + "block.mineralogy.slate_relief_plus": "Relief aus Schiefer (Pluszeichen)", + "block.mineralogy.slate_relief_right": "Relief aus Schiefer (rechts)", + "block.mineralogy.slate_relief_sword": "Relief aus Schiefer (Schwert)", + "block.mineralogy.slate_relief_vertical": "Relief aus Schiefer (senkrecht)", + "block.mineralogy.schist_relief_axe": "Relief aus Glimmerschiefer (Axt)", + "block.mineralogy.schist_relief_blank": "Relief aus Glimmerschiefer (ohne Motiv)", + "block.mineralogy.schist_relief_cross": "Relief aus Glimmerschiefer (Kreuz)", + "block.mineralogy.schist_relief_hammer": "Relief aus Glimmerschiefer (Hammer)", + "block.mineralogy.schist_relief_hoe": "Relief aus Glimmerschiefer (Hacke)", + "block.mineralogy.schist_relief_horizontal": "Relief aus Glimmerschiefer (waagerecht)", + "block.mineralogy.schist_relief_i": "Relief aus Glimmerschiefer (I)", + "block.mineralogy.schist_relief_left": "Relief aus Glimmerschiefer (links)", + "block.mineralogy.schist_relief_pickaxe": "Relief aus Glimmerschiefer (Spitzhacke)", + "block.mineralogy.schist_relief_plus": "Relief aus Glimmerschiefer (Pluszeichen)", + "block.mineralogy.schist_relief_right": "Relief aus Glimmerschiefer (rechts)", + "block.mineralogy.schist_relief_sword": "Relief aus Glimmerschiefer (Schwert)", + "block.mineralogy.schist_relief_vertical": "Relief aus Glimmerschiefer (senkrecht)", + "block.mineralogy.gneiss_relief_axe": "Relief aus Gneis (Axt)", + "block.mineralogy.gneiss_relief_blank": "Relief aus Gneis (ohne Motiv)", + "block.mineralogy.gneiss_relief_cross": "Relief aus Gneis (Kreuz)", + "block.mineralogy.gneiss_relief_hammer": "Relief aus Gneis (Hammer)", + "block.mineralogy.gneiss_relief_hoe": "Relief aus Gneis (Hacke)", + "block.mineralogy.gneiss_relief_horizontal": "Relief aus Gneis (waagerecht)", + "block.mineralogy.gneiss_relief_i": "Relief aus Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relief aus Gneis (links)", + "block.mineralogy.gneiss_relief_pickaxe": "Relief aus Gneis (Spitzhacke)", + "block.mineralogy.gneiss_relief_plus": "Relief aus Gneis (Pluszeichen)", + "block.mineralogy.gneiss_relief_right": "Relief aus Gneis (rechts)", + "block.mineralogy.gneiss_relief_sword": "Relief aus Gneis (Schwert)", + "block.mineralogy.gneiss_relief_vertical": "Relief aus Gneis (senkrecht)", + "block.mineralogy.phyllite_relief_axe": "Relief aus Phyllit (Axt)", + "block.mineralogy.phyllite_relief_blank": "Relief aus Phyllit (ohne Motiv)", + "block.mineralogy.phyllite_relief_cross": "Relief aus Phyllit (Kreuz)", + "block.mineralogy.phyllite_relief_hammer": "Relief aus Phyllit (Hammer)", + "block.mineralogy.phyllite_relief_hoe": "Relief aus Phyllit (Hacke)", + "block.mineralogy.phyllite_relief_horizontal": "Relief aus Phyllit (waagerecht)", + "block.mineralogy.phyllite_relief_i": "Relief aus Phyllit (I)", + "block.mineralogy.phyllite_relief_left": "Relief aus Phyllit (links)", + "block.mineralogy.phyllite_relief_pickaxe": "Relief aus Phyllit (Spitzhacke)", + "block.mineralogy.phyllite_relief_plus": "Relief aus Phyllit (Pluszeichen)", + "block.mineralogy.phyllite_relief_right": "Relief aus Phyllit (rechts)", + "block.mineralogy.phyllite_relief_sword": "Relief aus Phyllit (Schwert)", + "block.mineralogy.phyllite_relief_vertical": "Relief aus Phyllit (senkrecht)", + "block.mineralogy.amphibolite_relief_axe": "Relief aus Amphibolit (Axt)", + "block.mineralogy.amphibolite_relief_blank": "Relief aus Amphibolit (ohne Motiv)", + "block.mineralogy.amphibolite_relief_cross": "Relief aus Amphibolit (Kreuz)", + "block.mineralogy.amphibolite_relief_hammer": "Relief aus Amphibolit (Hammer)", + "block.mineralogy.amphibolite_relief_hoe": "Relief aus Amphibolit (Hacke)", + "block.mineralogy.amphibolite_relief_horizontal": "Relief aus Amphibolit (waagerecht)", + "block.mineralogy.amphibolite_relief_i": "Relief aus Amphibolit (I)", + "block.mineralogy.amphibolite_relief_left": "Relief aus Amphibolit (links)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relief aus Amphibolit (Spitzhacke)", + "block.mineralogy.amphibolite_relief_plus": "Relief aus Amphibolit (Pluszeichen)", + "block.mineralogy.amphibolite_relief_right": "Relief aus Amphibolit (rechts)", + "block.mineralogy.amphibolite_relief_sword": "Relief aus Amphibolit (Schwert)", + "block.mineralogy.amphibolite_relief_vertical": "Relief aus Amphibolit (senkrecht)", + "block.mineralogy.diabase_relief_axe": "Relief aus Diabas (Axt)", + "block.mineralogy.diabase_relief_blank": "Relief aus Diabas (ohne Motiv)", + "block.mineralogy.diabase_relief_cross": "Relief aus Diabas (Kreuz)", + "block.mineralogy.diabase_relief_hammer": "Relief aus Diabas (Hammer)", + "block.mineralogy.diabase_relief_hoe": "Relief aus Diabas (Hacke)", + "block.mineralogy.diabase_relief_horizontal": "Relief aus Diabas (waagerecht)", + "block.mineralogy.diabase_relief_i": "Relief aus Diabas (I)", + "block.mineralogy.diabase_relief_left": "Relief aus Diabas (links)", + "block.mineralogy.diabase_relief_pickaxe": "Relief aus Diabas (Spitzhacke)", + "block.mineralogy.diabase_relief_plus": "Relief aus Diabas (Pluszeichen)", + "block.mineralogy.diabase_relief_right": "Relief aus Diabas (rechts)", + "block.mineralogy.diabase_relief_sword": "Relief aus Diabas (Schwert)", + "block.mineralogy.diabase_relief_vertical": "Relief aus Diabas (senkrecht)", + "block.mineralogy.gabbro_relief_axe": "Relief aus Gabbro (Axt)", + "block.mineralogy.gabbro_relief_blank": "Relief aus Gabbro (ohne Motiv)", + "block.mineralogy.gabbro_relief_cross": "Relief aus Gabbro (Kreuz)", + "block.mineralogy.gabbro_relief_hammer": "Relief aus Gabbro (Hammer)", + "block.mineralogy.gabbro_relief_hoe": "Relief aus Gabbro (Hacke)", + "block.mineralogy.gabbro_relief_horizontal": "Relief aus Gabbro (waagerecht)", + "block.mineralogy.gabbro_relief_i": "Relief aus Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Relief aus Gabbro (links)", + "block.mineralogy.gabbro_relief_pickaxe": "Relief aus Gabbro (Spitzhacke)", + "block.mineralogy.gabbro_relief_plus": "Relief aus Gabbro (Pluszeichen)", + "block.mineralogy.gabbro_relief_right": "Relief aus Gabbro (rechts)", + "block.mineralogy.gabbro_relief_sword": "Relief aus Gabbro (Schwert)", + "block.mineralogy.gabbro_relief_vertical": "Relief aus Gabbro (senkrecht)", + "block.mineralogy.peridotite_relief_axe": "Relief aus Peridotit (Axt)", + "block.mineralogy.peridotite_relief_blank": "Relief aus Peridotit (ohne Motiv)", + "block.mineralogy.peridotite_relief_cross": "Relief aus Peridotit (Kreuz)", + "block.mineralogy.peridotite_relief_hammer": "Relief aus Peridotit (Hammer)", + "block.mineralogy.peridotite_relief_hoe": "Relief aus Peridotit (Hacke)", + "block.mineralogy.peridotite_relief_horizontal": "Relief aus Peridotit (waagerecht)", + "block.mineralogy.peridotite_relief_i": "Relief aus Peridotit (I)", + "block.mineralogy.peridotite_relief_left": "Relief aus Peridotit (links)", + "block.mineralogy.peridotite_relief_pickaxe": "Relief aus Peridotit (Spitzhacke)", + "block.mineralogy.peridotite_relief_plus": "Relief aus Peridotit (Pluszeichen)", + "block.mineralogy.peridotite_relief_right": "Relief aus Peridotit (rechts)", + "block.mineralogy.peridotite_relief_sword": "Relief aus Peridotit (Schwert)", + "block.mineralogy.peridotite_relief_vertical": "Relief aus Peridotit (senkrecht)", + "block.mineralogy.basaltic_glass_relief_axe": "Relief aus Basaltglas (Axt)", + "block.mineralogy.basaltic_glass_relief_blank": "Relief aus Basaltglas (ohne Motiv)", + "block.mineralogy.basaltic_glass_relief_cross": "Relief aus Basaltglas (Kreuz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relief aus Basaltglas (Hammer)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relief aus Basaltglas (Hacke)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relief aus Basaltglas (waagerecht)", + "block.mineralogy.basaltic_glass_relief_i": "Relief aus Basaltglas (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relief aus Basaltglas (links)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relief aus Basaltglas (Spitzhacke)", + "block.mineralogy.basaltic_glass_relief_plus": "Relief aus Basaltglas (Pluszeichen)", + "block.mineralogy.basaltic_glass_relief_right": "Relief aus Basaltglas (rechts)", + "block.mineralogy.basaltic_glass_relief_sword": "Relief aus Basaltglas (Schwert)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relief aus Basaltglas (senkrecht)", + "block.mineralogy.scoria_relief_axe": "Relief aus Skoria (Axt)", + "block.mineralogy.scoria_relief_blank": "Relief aus Skoria (ohne Motiv)", + "block.mineralogy.scoria_relief_cross": "Relief aus Skoria (Kreuz)", + "block.mineralogy.scoria_relief_hammer": "Relief aus Skoria (Hammer)", + "block.mineralogy.scoria_relief_hoe": "Relief aus Skoria (Hacke)", + "block.mineralogy.scoria_relief_horizontal": "Relief aus Skoria (waagerecht)", + "block.mineralogy.scoria_relief_i": "Relief aus Skoria (I)", + "block.mineralogy.scoria_relief_left": "Relief aus Skoria (links)", + "block.mineralogy.scoria_relief_pickaxe": "Relief aus Skoria (Spitzhacke)", + "block.mineralogy.scoria_relief_plus": "Relief aus Skoria (Pluszeichen)", + "block.mineralogy.scoria_relief_right": "Relief aus Skoria (rechts)", + "block.mineralogy.scoria_relief_sword": "Relief aus Skoria (Schwert)", + "block.mineralogy.scoria_relief_vertical": "Relief aus Skoria (senkrecht)", + "block.mineralogy.tuff_relief_axe": "Relief aus Tuffstein (Axt)", + "block.mineralogy.tuff_relief_blank": "Relief aus Tuffstein (ohne Motiv)", + "block.mineralogy.tuff_relief_cross": "Relief aus Tuffstein (Kreuz)", + "block.mineralogy.tuff_relief_hammer": "Relief aus Tuffstein (Hammer)", + "block.mineralogy.tuff_relief_hoe": "Relief aus Tuffstein (Hacke)", + "block.mineralogy.tuff_relief_horizontal": "Relief aus Tuffstein (waagerecht)", + "block.mineralogy.tuff_relief_i": "Relief aus Tuffstein (I)", + "block.mineralogy.tuff_relief_left": "Relief aus Tuffstein (links)", + "block.mineralogy.tuff_relief_pickaxe": "Relief aus Tuffstein (Spitzhacke)", + "block.mineralogy.tuff_relief_plus": "Relief aus Tuffstein (Pluszeichen)", + "block.mineralogy.tuff_relief_right": "Relief aus Tuffstein (rechts)", + "block.mineralogy.tuff_relief_sword": "Relief aus Tuffstein (Schwert)", + "block.mineralogy.tuff_relief_vertical": "Relief aus Tuffstein (senkrecht)", + "block.mineralogy.siltstone_relief_axe": "Relief aus Schluffstein (Axt)", + "block.mineralogy.siltstone_relief_blank": "Relief aus Schluffstein (ohne Motiv)", + "block.mineralogy.siltstone_relief_cross": "Relief aus Schluffstein (Kreuz)", + "block.mineralogy.siltstone_relief_hammer": "Relief aus Schluffstein (Hammer)", + "block.mineralogy.siltstone_relief_hoe": "Relief aus Schluffstein (Hacke)", + "block.mineralogy.siltstone_relief_horizontal": "Relief aus Schluffstein (waagerecht)", + "block.mineralogy.siltstone_relief_i": "Relief aus Schluffstein (I)", + "block.mineralogy.siltstone_relief_left": "Relief aus Schluffstein (links)", + "block.mineralogy.siltstone_relief_pickaxe": "Relief aus Schluffstein (Spitzhacke)", + "block.mineralogy.siltstone_relief_plus": "Relief aus Schluffstein (Pluszeichen)", + "block.mineralogy.siltstone_relief_right": "Relief aus Schluffstein (rechts)", + "block.mineralogy.siltstone_relief_sword": "Relief aus Schluffstein (Schwert)", + "block.mineralogy.siltstone_relief_vertical": "Relief aus Schluffstein (senkrecht)", + "block.mineralogy.rock_salt_relief_axe": "Relief aus Steinsalz (Axt)", + "block.mineralogy.rock_salt_relief_blank": "Relief aus Steinsalz (ohne Motiv)", + "block.mineralogy.rock_salt_relief_cross": "Relief aus Steinsalz (Kreuz)", + "block.mineralogy.rock_salt_relief_hammer": "Relief aus Steinsalz (Hammer)", + "block.mineralogy.rock_salt_relief_hoe": "Relief aus Steinsalz (Hacke)", + "block.mineralogy.rock_salt_relief_horizontal": "Relief aus Steinsalz (waagerecht)", + "block.mineralogy.rock_salt_relief_i": "Relief aus Steinsalz (I)", + "block.mineralogy.rock_salt_relief_left": "Relief aus Steinsalz (links)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relief aus Steinsalz (Spitzhacke)", + "block.mineralogy.rock_salt_relief_plus": "Relief aus Steinsalz (Pluszeichen)", + "block.mineralogy.rock_salt_relief_right": "Relief aus Steinsalz (rechts)", + "block.mineralogy.rock_salt_relief_sword": "Relief aus Steinsalz (Schwert)", + "block.mineralogy.rock_salt_relief_vertical": "Relief aus Steinsalz (senkrecht)", + "block.mineralogy.hornfels_relief_axe": "Relief aus Hornfels (Axt)", + "block.mineralogy.hornfels_relief_blank": "Relief aus Hornfels (ohne Motiv)", + "block.mineralogy.hornfels_relief_cross": "Relief aus Hornfels (Kreuz)", + "block.mineralogy.hornfels_relief_hammer": "Relief aus Hornfels (Hammer)", + "block.mineralogy.hornfels_relief_hoe": "Relief aus Hornfels (Hacke)", + "block.mineralogy.hornfels_relief_horizontal": "Relief aus Hornfels (waagerecht)", + "block.mineralogy.hornfels_relief_i": "Relief aus Hornfels (I)", + "block.mineralogy.hornfels_relief_left": "Relief aus Hornfels (links)", + "block.mineralogy.hornfels_relief_pickaxe": "Relief aus Hornfels (Spitzhacke)", + "block.mineralogy.hornfels_relief_plus": "Relief aus Hornfels (Pluszeichen)", + "block.mineralogy.hornfels_relief_right": "Relief aus Hornfels (rechts)", + "block.mineralogy.hornfels_relief_sword": "Relief aus Hornfels (Schwert)", + "block.mineralogy.hornfels_relief_vertical": "Relief aus Hornfels (senkrecht)", + "block.mineralogy.quartzite_relief_axe": "Relief aus Quarzit (Axt)", + "block.mineralogy.quartzite_relief_blank": "Relief aus Quarzit (ohne Motiv)", + "block.mineralogy.quartzite_relief_cross": "Relief aus Quarzit (Kreuz)", + "block.mineralogy.quartzite_relief_hammer": "Relief aus Quarzit (Hammer)", + "block.mineralogy.quartzite_relief_hoe": "Relief aus Quarzit (Hacke)", + "block.mineralogy.quartzite_relief_horizontal": "Relief aus Quarzit (waagerecht)", + "block.mineralogy.quartzite_relief_i": "Relief aus Quarzit (I)", + "block.mineralogy.quartzite_relief_left": "Relief aus Quarzit (links)", + "block.mineralogy.quartzite_relief_pickaxe": "Relief aus Quarzit (Spitzhacke)", + "block.mineralogy.quartzite_relief_plus": "Relief aus Quarzit (Pluszeichen)", + "block.mineralogy.quartzite_relief_right": "Relief aus Quarzit (rechts)", + "block.mineralogy.quartzite_relief_sword": "Relief aus Quarzit (Schwert)", + "block.mineralogy.quartzite_relief_vertical": "Relief aus Quarzit (senkrecht)", + "block.mineralogy.novaculite_relief_axe": "Relief aus Novakulit (Axt)", + "block.mineralogy.novaculite_relief_blank": "Relief aus Novakulit (ohne Motiv)", + "block.mineralogy.novaculite_relief_cross": "Relief aus Novakulit (Kreuz)", + "block.mineralogy.novaculite_relief_hammer": "Relief aus Novakulit (Hammer)", + "block.mineralogy.novaculite_relief_hoe": "Relief aus Novakulit (Hacke)", + "block.mineralogy.novaculite_relief_horizontal": "Relief aus Novakulit (waagerecht)", + "block.mineralogy.novaculite_relief_i": "Relief aus Novakulit (I)", + "block.mineralogy.novaculite_relief_left": "Relief aus Novakulit (links)", + "block.mineralogy.novaculite_relief_pickaxe": "Relief aus Novakulit (Spitzhacke)", + "block.mineralogy.novaculite_relief_plus": "Relief aus Novakulit (Pluszeichen)", + "block.mineralogy.novaculite_relief_right": "Relief aus Novakulit (rechts)", + "block.mineralogy.novaculite_relief_sword": "Relief aus Novakulit (Schwert)", + "block.mineralogy.novaculite_relief_vertical": "Relief aus Novakulit (senkrecht)", "itemGroup.mineralogy.mineralogy": "Mineralogie", "itemGroup.mineralogy.rock": "Mineralogische Gesteine", - "itemGroup.mineralogy.stair": "Mineralogie-Treppe", - "itemGroup.mineralogy.slab": "Mineralogieplatten", - "itemGroup.mineralogy.wall": "Mineralogie-Wände", - "itemGroup.mineralogy.item": "Mineralogieartikel" + "itemGroup.mineralogy.stair": "Mineralogie-Treppen", + "itemGroup.mineralogy.slab": "Mineralogie-Stufen", + "itemGroup.mineralogy.wall": "Mineralogie-Mauern", + "itemGroup.mineralogy.item": "Mineralogie-Gegenstände", + "block.mineralogy.crude_oil": "Rohöl", + "item.mineralogy.crude_oil_bucket": "Rohöleimer", + "fluid.mineralogy.crude_oil": "Rohöl", + "advancements.mineralogy.all_the_rocks.title": "Alle Gesteine", + "advancements.mineralogy.all_the_rocks.description": "Du hast alle Standardgesteine in Mineralogy gefunden!" } diff --git a/src/main/resources/assets/mineralogy/lang/de_de.json b/src/main/resources/assets/mineralogy/lang/de_de.json index 2928e5a1c..09373688a 100644 --- a/src/main/resources/assets/mineralogy/lang/de_de.json +++ b/src/main/resources/assets/mineralogy/lang/de_de.json @@ -1,202 +1,202 @@ { "block.mineralogy.andesite": "Andesit", - "block.mineralogy.andesite_stairs": "Andesit-Treppe", - "block.mineralogy.andesite_slab": "Andesit-Platte", - "block.mineralogy.andesite_brick": "Andesit-Ziegelstein", - "block.mineralogy.andesite_brick_stairs": "Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_brick_slab": "Andesit-Ziegelsteinplatte", - "block.mineralogy.andesite_smooth": "Polierter Andesit", - "block.mineralogy.andesite_smooth_stairs": "Polierte Andesit-Treppe", - "block.mineralogy.andesite_smooth_slab": "Polierte Andesit-Platte", - "block.mineralogy.andesite_smooth_brick": "Polierter Andesit-Ziegelstein", - "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_smooth_brick_slab": "Polierte Andesit-Ziegelsteinplatte", + "block.mineralogy.andesite_stairs": "Treppe aus Andesit", + "block.mineralogy.andesite_slab": "Stufe aus Andesit", + "block.mineralogy.andesite_brick": "Ziegel aus Andesit", + "block.mineralogy.andesite_brick_stairs": "Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_brick_slab": "Ziegelstufe aus Andesit", + "block.mineralogy.andesite_smooth": "Polierter Block aus Andesit", + "block.mineralogy.andesite_smooth_stairs": "Polierte Treppe aus Andesit", + "block.mineralogy.andesite_smooth_slab": "Polierte Stufe aus Andesit", + "block.mineralogy.andesite_smooth_brick": "Polierte Ziegel aus Andesit", + "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_smooth_brick_slab": "Polierte Ziegelstufe aus Andesit", "block.mineralogy.basalt": "Basalt", - "block.mineralogy.basalt_stairs": "Basalt Treppen", - "block.mineralogy.basalt_slab": "Basaltplatte", - "block.mineralogy.basalt_brick": "Basaltstein", - "block.mineralogy.basalt_brick_stairs": "Basaltstein Treppen", - "block.mineralogy.basalt_brick_slab": "Basaltstein Platte", - "block.mineralogy.basalt_smooth": "Polierter Basalt", - "block.mineralogy.basalt_smooth_stairs": "Polierte Basalt Treppen", - "block.mineralogy.basalt_smooth_slab": "Polierte Basaltplatte", - "block.mineralogy.basalt_smooth_brick": "Polierter Basaltstein", - "block.mineralogy.basalt_smooth_brick_stairs": "Polierter Basaltstein-Treppen", - "block.mineralogy.basalt_smooth_brick_slab": "Polierter Basaltstein-Platte", + "block.mineralogy.basalt_stairs": "Treppe aus Basalt", + "block.mineralogy.basalt_slab": "Stufe aus Basalt", + "block.mineralogy.basalt_brick": "Ziegel aus Basalt", + "block.mineralogy.basalt_brick_stairs": "Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_brick_slab": "Ziegelstufe aus Basalt", + "block.mineralogy.basalt_smooth": "Polierter Block aus Basalt", + "block.mineralogy.basalt_smooth_stairs": "Polierte Treppe aus Basalt", + "block.mineralogy.basalt_smooth_slab": "Polierte Stufe aus Basalt", + "block.mineralogy.basalt_smooth_brick": "Polierte Ziegel aus Basalt", + "block.mineralogy.basalt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_smooth_brick_slab": "Polierte Ziegelstufe aus Basalt", "block.mineralogy.diorite": "Diorit", - "block.mineralogy.diorite_stairs": "Diorite Treppen", - "block.mineralogy.diorite_slab": "Dioritplatte", - "block.mineralogy.diorite_brick": "Dioritstein", - "block.mineralogy.diorite_brick_stairs": "Dioritstein Treppen", - "block.mineralogy.diorite_brick_slab": "Dioritstein Platte", - "block.mineralogy.diorite_smooth": "Polierter Diorit", - "block.mineralogy.diorite_smooth_stairs": "Polierte Diorit-Treppe", - "block.mineralogy.diorite_smooth_slab": "Polierte Dioritplatte", - "block.mineralogy.diorite_smooth_brick": "Polierter Diorit-Ziegelstein", - "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Dioritstein-Treppe", - "block.mineralogy.diorite_smooth_brick_slab": "Polierte Dioritstein-Platte", + "block.mineralogy.diorite_stairs": "Treppe aus Diorit", + "block.mineralogy.diorite_slab": "Stufe aus Diorit", + "block.mineralogy.diorite_brick": "Ziegel aus Diorit", + "block.mineralogy.diorite_brick_stairs": "Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_brick_slab": "Ziegelstufe aus Diorit", + "block.mineralogy.diorite_smooth": "Polierter Block aus Diorit", + "block.mineralogy.diorite_smooth_stairs": "Polierte Treppe aus Diorit", + "block.mineralogy.diorite_smooth_slab": "Polierte Stufe aus Diorit", + "block.mineralogy.diorite_smooth_brick": "Polierte Ziegel aus Diorit", + "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_smooth_brick_slab": "Polierte Ziegelstufe aus Diorit", "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Granit Treppe", - "block.mineralogy.granite_slab": "Granitplatte", - "block.mineralogy.granite_brick": "Granitstein", - "block.mineralogy.granite_brick_stairs": "Granitstein-Treppen", - "block.mineralogy.granite_brick_slab": "Granitstein-Platte", - "block.mineralogy.granite_smooth": "Polierter Granit", - "block.mineralogy.granite_smooth_stairs": "Polierte Granittreppe", - "block.mineralogy.granite_smooth_slab": "Polierte Granitplatte", - "block.mineralogy.granite_smooth_brick": "Polierter Granitstein", - "block.mineralogy.granite_smooth_brick_stairs": "Polierter Granitstein-Treppen", - "block.mineralogy.granite_smooth_brick_slab": "Polierter Granitstein-Platte", + "block.mineralogy.granite_stairs": "Treppe aus Granit", + "block.mineralogy.granite_slab": "Stufe aus Granit", + "block.mineralogy.granite_brick": "Ziegel aus Granit", + "block.mineralogy.granite_brick_stairs": "Ziegeltreppe aus Granit", + "block.mineralogy.granite_brick_slab": "Ziegelstufe aus Granit", + "block.mineralogy.granite_smooth": "Polierter Block aus Granit", + "block.mineralogy.granite_smooth_stairs": "Polierte Treppe aus Granit", + "block.mineralogy.granite_smooth_slab": "Polierte Stufe aus Granit", + "block.mineralogy.granite_smooth_brick": "Polierte Ziegel aus Granit", + "block.mineralogy.granite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Granit", + "block.mineralogy.granite_smooth_brick_slab": "Polierte Ziegelstufe aus Granit", "block.mineralogy.rhyolite": "Rhyolith", - "block.mineralogy.rhyolite_stairs": "Rhyolith Treppen", - "block.mineralogy.rhyolite_slab": "Rhyolithplatte", - "block.mineralogy.rhyolite_brick": "Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_brick_stairs": "Rhyolith-Ziegelstein-Treppen", - "block.mineralogy.rhyolite_brick_slab": "Rhyolith-Ziegelstein-Platte", - "block.mineralogy.rhyolite_smooth": "Polierter Rhyolith", - "block.mineralogy.rhyolite_smooth_stairs": "Polierte Rhyolith Treppen", - "block.mineralogy.rhyolite_smooth_slab": "Polierte Rhyolithplatte", - "block.mineralogy.rhyolite_smooth_brick": "Polierter Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Rhyolith-Ziegelstein-Treppe", - "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Rhyolith-Ziegelstein-Platte", + "block.mineralogy.rhyolite_stairs": "Treppe aus Rhyolith", + "block.mineralogy.rhyolite_slab": "Stufe aus Rhyolith", + "block.mineralogy.rhyolite_brick": "Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_brick_stairs": "Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_brick_slab": "Ziegelstufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth": "Polierter Block aus Rhyolith", + "block.mineralogy.rhyolite_smooth_stairs": "Polierte Treppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_slab": "Polierte Stufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick": "Polierte Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Ziegelstufe aus Rhyolith", "block.mineralogy.pegmatite": "Pegmatit", - "block.mineralogy.pegmatite_stairs": "Pegmatite-Treppen", - "block.mineralogy.pegmatite_slab": "Pegmatite-Platte", - "block.mineralogy.pegmatite_brick": "Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_brick_stairs": "Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_brick_slab": "Pegmatite Ziegelsteinplatte", - "block.mineralogy.pegmatite_smooth": "Polierter Pegmatit", - "block.mineralogy.pegmatite_smooth_stairs": "Polierte Pegmatite Treppen", - "block.mineralogy.pegmatite_smooth_slab": "Polierte Pegmatite Platte", - "block.mineralogy.pegmatite_smooth_brick": "Polierter Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Pegmatite Ziegelsteinplatte", - "block.mineralogy.shale": "Schiefer", - "block.mineralogy.shale_stairs": "Schiefer Treppen", - "block.mineralogy.shale_slab": "Schieferplatte", - "block.mineralogy.shale_brick": "Schiefer-Ziegelstein", - "block.mineralogy.shale_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.shale_smooth": "Polierter Schiefer", - "block.mineralogy.shale_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.shale_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.shale_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.shale_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.pegmatite_stairs": "Treppe aus Pegmatit", + "block.mineralogy.pegmatite_slab": "Stufe aus Pegmatit", + "block.mineralogy.pegmatite_brick": "Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_brick_stairs": "Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_brick_slab": "Ziegelstufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth": "Polierter Block aus Pegmatit", + "block.mineralogy.pegmatite_smooth_stairs": "Polierte Treppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_slab": "Polierte Stufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick": "Polierte Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Ziegelstufe aus Pegmatit", + "block.mineralogy.shale": "Tonschiefer", + "block.mineralogy.shale_stairs": "Treppe aus Tonschiefer", + "block.mineralogy.shale_slab": "Stufe aus Tonschiefer", + "block.mineralogy.shale_brick": "Ziegel aus Tonschiefer", + "block.mineralogy.shale_brick_stairs": "Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_brick_slab": "Ziegelstufe aus Tonschiefer", + "block.mineralogy.shale_smooth": "Polierter Block aus Tonschiefer", + "block.mineralogy.shale_smooth_stairs": "Polierte Treppe aus Tonschiefer", + "block.mineralogy.shale_smooth_slab": "Polierte Stufe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick": "Polierte Ziegel aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_slab": "Polierte Ziegelstufe aus Tonschiefer", "block.mineralogy.conglomerate": "Konglomerat", - "block.mineralogy.conglomerate_stairs": "Konglomerat Treppen", - "block.mineralogy.conglomerate_slab": "Konglomeratplatte", - "block.mineralogy.conglomerate_brick": "Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_brick_stairs": "Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_brick_slab": "Konglomerat-Ziegelstein-Platte", - "block.mineralogy.conglomerate_smooth": "Poliertes Konglomerat", - "block.mineralogy.conglomerate_smooth_stairs": "Polierte Konglomerat Treppen", - "block.mineralogy.conglomerate_smooth_slab": "Polierte Konglomeratplatte", - "block.mineralogy.conglomerate_smooth_brick": "Polierter Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierter Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_smooth_brick_slab": "Polierter Konglomerat-Ziegelstein-Platte", + "block.mineralogy.conglomerate_stairs": "Treppe aus Konglomerat", + "block.mineralogy.conglomerate_slab": "Stufe aus Konglomerat", + "block.mineralogy.conglomerate_brick": "Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_brick_stairs": "Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_brick_slab": "Ziegelstufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth": "Polierter Block aus Konglomerat", + "block.mineralogy.conglomerate_smooth_stairs": "Polierte Treppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_slab": "Polierte Stufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick": "Polierte Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Polierte Ziegelstufe aus Konglomerat", "block.mineralogy.dolomite": "Dolomit", - "block.mineralogy.dolomite_stairs": "Dolomit Treppen", - "block.mineralogy.dolomite_slab": "Dolomit-Platte", - "block.mineralogy.dolomite_brick": "Dolomit-Ziegelstein", - "block.mineralogy.dolomite_brick_stairs": "Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_brick_slab": "Dolomit-Ziegelstein-Platte", - "block.mineralogy.dolomite_smooth": "Polierter Dolomit", - "block.mineralogy.dolomite_smooth_stairs": "Polierte Dolomitentreppe", - "block.mineralogy.dolomite_smooth_slab": "Polierte Dolomitplatte", - "block.mineralogy.dolomite_smooth_brick": "Polierter Dolomitstein", - "block.mineralogy.dolomite_smooth_brick_stairs": "Polierter Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_smooth_brick_slab": "Polierter Dolomit-Ziegelstein-Platte", + "block.mineralogy.dolomite_stairs": "Treppe aus Dolomit", + "block.mineralogy.dolomite_slab": "Stufe aus Dolomit", + "block.mineralogy.dolomite_brick": "Ziegel aus Dolomit", + "block.mineralogy.dolomite_brick_stairs": "Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_brick_slab": "Ziegelstufe aus Dolomit", + "block.mineralogy.dolomite_smooth": "Polierter Block aus Dolomit", + "block.mineralogy.dolomite_smooth_stairs": "Polierte Treppe aus Dolomit", + "block.mineralogy.dolomite_smooth_slab": "Polierte Stufe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick": "Polierte Ziegel aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_slab": "Polierte Ziegelstufe aus Dolomit", "block.mineralogy.limestone": "Kalkstein", - "block.mineralogy.limestone_stairs": "Kalkstein-Treppen", - "block.mineralogy.limestone_slab": "Kalksteinplatte", - "block.mineralogy.limestone_brick": "Kalkstein-Ziegelstein", - "block.mineralogy.limestone_brick_stairs": "Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_brick_slab": "Kalkstein-Ziegelstein-Platte", - "block.mineralogy.limestone_smooth": "Polierter Kalkstein", - "block.mineralogy.limestone_smooth_stairs": "Polierte Kalksteintreppe", - "block.mineralogy.limestone_smooth_slab": "Polierte Kalksteinplatte", - "block.mineralogy.limestone_smooth_brick": "Polierter Kalkstein-Ziegelstein", - "block.mineralogy.limestone_smooth_brick_stairs": "Polierter Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_smooth_brick_slab": "Polierter Kalkstein-Ziegelstein-Platte", + "block.mineralogy.limestone_stairs": "Treppe aus Kalkstein", + "block.mineralogy.limestone_slab": "Stufe aus Kalkstein", + "block.mineralogy.limestone_brick": "Ziegel aus Kalkstein", + "block.mineralogy.limestone_brick_stairs": "Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_brick_slab": "Ziegelstufe aus Kalkstein", + "block.mineralogy.limestone_smooth": "Polierter Block aus Kalkstein", + "block.mineralogy.limestone_smooth_stairs": "Polierte Treppe aus Kalkstein", + "block.mineralogy.limestone_smooth_slab": "Polierte Stufe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick": "Polierte Ziegel aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_slab": "Polierte Ziegelstufe aus Kalkstein", "block.mineralogy.slate": "Schiefer", - "block.mineralogy.slate_stairs": "Schiefer Treppen", - "block.mineralogy.slate_slab": "Schieferplatte", - "block.mineralogy.slate_brick": "Schiefer-Ziegelstein", - "block.mineralogy.slate_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.slate_smooth": "Polierter Schiefer", - "block.mineralogy.slate_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.slate_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.slate_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.slate_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist": "Schiefer", - "block.mineralogy.schist_stairs": "Schiefer Treppen", - "block.mineralogy.schist_slab": "Schieferplatte", - "block.mineralogy.schist_brick": "Schiefer-Ziegelstein", - "block.mineralogy.schist_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist_smooth": "Polierter Schiefer", - "block.mineralogy.schist_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.schist_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.schist_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.schist_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.slate_stairs": "Treppe aus Schiefer", + "block.mineralogy.slate_slab": "Stufe aus Schiefer", + "block.mineralogy.slate_brick": "Ziegel aus Schiefer", + "block.mineralogy.slate_brick_stairs": "Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_brick_slab": "Ziegelstufe aus Schiefer", + "block.mineralogy.slate_smooth": "Polierter Block aus Schiefer", + "block.mineralogy.slate_smooth_stairs": "Polierte Treppe aus Schiefer", + "block.mineralogy.slate_smooth_slab": "Polierte Stufe aus Schiefer", + "block.mineralogy.slate_smooth_brick": "Polierte Ziegel aus Schiefer", + "block.mineralogy.slate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_smooth_brick_slab": "Polierte Ziegelstufe aus Schiefer", + "block.mineralogy.schist": "Glimmerschiefer", + "block.mineralogy.schist_stairs": "Treppe aus Glimmerschiefer", + "block.mineralogy.schist_slab": "Stufe aus Glimmerschiefer", + "block.mineralogy.schist_brick": "Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_brick_stairs": "Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_brick_slab": "Ziegelstufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth": "Polierter Block aus Glimmerschiefer", + "block.mineralogy.schist_smooth_stairs": "Polierte Treppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_slab": "Polierte Stufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick": "Polierte Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_stairs": "Polierte Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_slab": "Polierte Ziegelstufe aus Glimmerschiefer", "block.mineralogy.gneiss": "Gneis", - "block.mineralogy.gneiss_stairs": "Gneistreppe", - "block.mineralogy.gneiss_slab": "Gneisplatte", - "block.mineralogy.gneiss_brick": "Gneis Ziegel", - "block.mineralogy.gneiss_brick_stairs": "Gneis Ziegeltreppen", - "block.mineralogy.gneiss_brick_slab": "Gneissteinplatte", - "block.mineralogy.gneiss_smooth": "Polierter Gneis", - "block.mineralogy.gneiss_smooth_stairs": "Polierte Gneistreppe", - "block.mineralogy.gneiss_smooth_slab": "Polierte Gneisplatte", - "block.mineralogy.gneiss_smooth_brick": "Polierter Gneisstein", - "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Gneisziegeltreppen", - "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Gneissteinplatte", + "block.mineralogy.gneiss_stairs": "Treppe aus Gneis", + "block.mineralogy.gneiss_slab": "Stufe aus Gneis", + "block.mineralogy.gneiss_brick": "Ziegel aus Gneis", + "block.mineralogy.gneiss_brick_stairs": "Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_brick_slab": "Ziegelstufe aus Gneis", + "block.mineralogy.gneiss_smooth": "Polierter Block aus Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Polierte Treppe aus Gneis", + "block.mineralogy.gneiss_smooth_slab": "Polierte Stufe aus Gneis", + "block.mineralogy.gneiss_smooth_brick": "Polierte Ziegel aus Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Ziegelstufe aus Gneis", "block.mineralogy.marble": "Marmor", - "block.mineralogy.marble_stairs": "Marmortreppe", - "block.mineralogy.marble_slab": "Marmorplatte", - "block.mineralogy.marble_brick": "Marmor Backstein", - "block.mineralogy.marble_brick_stairs": "Marmor Backstein Treppe", - "block.mineralogy.marble_brick_slab": "Marmor Ziegelplatte", - "block.mineralogy.marble_smooth": "Polierter Marmor", - "block.mineralogy.marble_smooth_stairs": "Polierte Marmortreppe", - "block.mineralogy.marble_smooth_slab": "Polierte Marmorplatte", - "block.mineralogy.marble_smooth_brick": "Polierter Marmor Ziegelstein", - "block.mineralogy.marble_smooth_brick_stairs": "Polierte Marmor Ziegelstein Treppen", - "block.mineralogy.marble_smooth_brick_slab": "Polierte Marmor Ziegelstein Platte", + "block.mineralogy.marble_stairs": "Treppe aus Marmor", + "block.mineralogy.marble_slab": "Stufe aus Marmor", + "block.mineralogy.marble_brick": "Ziegel aus Marmor", + "block.mineralogy.marble_brick_stairs": "Ziegeltreppe aus Marmor", + "block.mineralogy.marble_brick_slab": "Ziegelstufe aus Marmor", + "block.mineralogy.marble_smooth": "Polierter Block aus Marmor", + "block.mineralogy.marble_smooth_stairs": "Polierte Treppe aus Marmor", + "block.mineralogy.marble_smooth_slab": "Polierte Stufe aus Marmor", + "block.mineralogy.marble_smooth_brick": "Polierte Ziegel aus Marmor", + "block.mineralogy.marble_smooth_brick_stairs": "Polierte Ziegeltreppe aus Marmor", + "block.mineralogy.marble_smooth_brick_slab": "Polierte Ziegelstufe aus Marmor", "block.mineralogy.phyllite": "Phyllit", - "block.mineralogy.phyllite_stairs": "Phyllit Treppen", - "block.mineralogy.phyllite_slab": "Phyllitplatte", - "block.mineralogy.phyllite_brick": "Phyllitstein", - "block.mineralogy.phyllite_brick_stairs": "Phyllite-Ziegelstein-Treppen", - "block.mineralogy.phyllite_brick_slab": "Phyllite-Ziegelstein-Platte", - "block.mineralogy.phyllite_smooth": "Polierter Phyllit", - "block.mineralogy.phyllite_smooth_stairs": "Polierte Phyllit Treppen", - "block.mineralogy.phyllite_smooth_slab": "Polierte Phyllitplatte", - "block.mineralogy.phyllite_smooth_brick": "Polierter Phyllit-Stein", - "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Phyllit-Ziegelstein-Treppe", - "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Phyllit-Ziegelsteinplatte", + "block.mineralogy.phyllite_stairs": "Treppe aus Phyllit", + "block.mineralogy.phyllite_slab": "Stufe aus Phyllit", + "block.mineralogy.phyllite_brick": "Ziegel aus Phyllit", + "block.mineralogy.phyllite_brick_stairs": "Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_brick_slab": "Ziegelstufe aus Phyllit", + "block.mineralogy.phyllite_smooth": "Polierter Block aus Phyllit", + "block.mineralogy.phyllite_smooth_stairs": "Polierte Treppe aus Phyllit", + "block.mineralogy.phyllite_smooth_slab": "Polierte Stufe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick": "Polierte Ziegel aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Ziegelstufe aus Phyllit", "block.mineralogy.amphibolite": "Amphibolit", - "block.mineralogy.amphibolite_stairs": "Amphibolit Treppen", - "block.mineralogy.amphibolite_slab": "Amphibolit-Platte", - "block.mineralogy.amphibolite_brick": "Amphibolitstein", - "block.mineralogy.amphibolite_brick_stairs": "Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_brick_slab": "Amphibolit-Ziegelstein-Platte", - "block.mineralogy.amphibolite_smooth": "Polierter Amphibolit", - "block.mineralogy.amphibolite_smooth_stairs": "Polierte Amphibolit Treppen", - "block.mineralogy.amphibolite_smooth_slab": "Polierte Amphibolitplatte", - "block.mineralogy.amphibolite_smooth_brick": "Polierter Amphibolit-Stein", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Amphibolit-Ziegelstein-Platte", - "item.mineralogy.gypsum_dust": "Gips Staub", - "item.mineralogy.sulfur_dust": "Schwefel Staub", - "item.mineralogy.phosphorous_dust": "Phosphor Staub", - "item.mineralogy.nitrate_dust": "Nitrat Staub", + "block.mineralogy.amphibolite_stairs": "Treppe aus Amphibolit", + "block.mineralogy.amphibolite_slab": "Stufe aus Amphibolit", + "block.mineralogy.amphibolite_brick": "Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_brick_stairs": "Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_brick_slab": "Ziegelstufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth": "Polierter Block aus Amphibolit", + "block.mineralogy.amphibolite_smooth_stairs": "Polierte Treppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_slab": "Polierte Stufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick": "Polierte Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Ziegelstufe aus Amphibolit", + "item.mineralogy.gypsum_dust": "Gipspulver", + "item.mineralogy.sulfur_dust": "Schwefelpulver", + "item.mineralogy.phosphorous_dust": "Phosphorpulver", + "item.mineralogy.nitrate_dust": "Nitratpulver", "item.mineralogy.mineral_fertilizer": "Mineraldünger", - "block.mineralogy.chert": "Chert", + "block.mineralogy.chert": "Hornstein", "block.mineralogy.gypsum": "Gips", "block.mineralogy.pumice": "Bimsstein", "block.mineralogy.sulfur_block": "Schwefel", @@ -204,737 +204,737 @@ "block.mineralogy.phosphorous_block": "Phosphor", "block.mineralogy.phosphorous_ore": "Phosphorerz", "block.mineralogy.nitrate_block": "Nitrat", - "block.mineralogy.nitrate_ore": "Nitrat-Erz", - "block.mineralogy.drywall_black": "Schwarzer Trockenbau", - "block.mineralogy.drywall_red": "Roter Trockenbau", - "block.mineralogy.drywall_green": "Grüner Trockenbau", - "block.mineralogy.drywall_brown": "Brauner Trockenbau", - "block.mineralogy.drywall_blue": "Blaue Trockenmauer", - "block.mineralogy.drywall_purple": "Lila Trockenbau", - "block.mineralogy.drywall_cyan": "Cyan Trockenbau", - "block.mineralogy.drywall_silver": "Silberner Trockenbau", - "block.mineralogy.drywall_gray": "Graue Trockenmauer", - "block.mineralogy.drywall_pink": "Rosa Trockenbau", - "block.mineralogy.drywall_lime": "Kalk Trockenbau", - "block.mineralogy.drywall_yellow": "Gelber Trockenbau", - "block.mineralogy.drywall_light_blue": "Hellblaue Trockenmauer", - "block.mineralogy.drywall_magenta": "Magenta Trockenbau", - "block.mineralogy.drywall_orange": "Orange Trockenbau", - "block.mineralogy.drywall_white": "Weißer Trockenbau", - "block.mineralogy.andesite_wall": "Andesit-Wand", - "block.mineralogy.andesite_brick_wall": "Andesit-Backsteinmauer", - "block.mineralogy.andesite_smooth_wall": "Andesite polierte Wand", - "block.mineralogy.andesite_smooth_brick_wall": "Andesite polierte Backsteinmauer", - "block.mineralogy.basalt_wall": "Basaltmauer", - "block.mineralogy.basalt_brick_wall": "Basalt-Backsteinmauer", - "block.mineralogy.basalt_smooth_wall": "Basalt polierte Wand", - "block.mineralogy.basalt_smooth_brick_wall": "Basalt polierte Backsteinmauer", - "block.mineralogy.diorite_wall": "Dioritwand", - "block.mineralogy.diorite_brick_wall": "Diorit-Ziegelmauer", - "block.mineralogy.diorite_smooth_wall": "Diorite polierte Wand", - "block.mineralogy.diorite_smooth_brick_wall": "Diorite polierte Backsteinmauer", - "block.mineralogy.granite_wall": "Granitwand", - "block.mineralogy.granite_brick_wall": "Granit-Backsteinmauer", - "block.mineralogy.granite_smooth_wall": "Granit poliert Wand", - "block.mineralogy.granite_smooth_brick_wall": "Granit poliert Ziegelmauer", - "block.mineralogy.rhyolite_wall": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_wall": "Rhyolith-Backsteinmauer", - "block.mineralogy.rhyolite_smooth_wall": "Rhyolith poliert Wand", - "block.mineralogy.rhyolite_smooth_brick_wall": "Rhyolith polierte Backsteinmauer", - "block.mineralogy.pegmatite_wall": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_wall": "Pegmatite-Ziegelmauer", - "block.mineralogy.pegmatite_smooth_wall": "Pegmatite polierte Wand", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pegmatite polierte Backsteinmauer", - "block.mineralogy.shale_wall": "Schieferwand", - "block.mineralogy.shale_brick_wall": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_wall": "Schiefer poliert Wand", - "block.mineralogy.shale_smooth_brick_wall": "Schiefer poliert Ziegelmauer", - "block.mineralogy.conglomerate_wall": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_wall": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_wall": "Konglomerat polierte Wand", - "block.mineralogy.conglomerate_smooth_brick_wall": "Konglomerat polierte Backsteinmauer", - "block.mineralogy.dolomite_wall": "Dolomitenwand", - "block.mineralogy.dolomite_brick_wall": "Dolomit-Ziegelmauer", - "block.mineralogy.dolomite_smooth_wall": "Dolomit polierte Wand", - "block.mineralogy.dolomite_smooth_brick_wall": "Dolomit polierte Ziegelmauer", - "block.mineralogy.limestone_wall": "Kalksteinmauer", - "block.mineralogy.limestone_brick_wall": "Kalkstein-Backsteinmauer", - "block.mineralogy.limestone_smooth_wall": "Kalkstein polierte Wand", - "block.mineralogy.limestone_smooth_brick_wall": "Kalkstein poliert Ziegelmauer", - "block.mineralogy.marble_wall": "Marmorwand", - "block.mineralogy.marble_brick_wall": "Marmor Backsteinmauer", - "block.mineralogy.marble_smooth_wall": "Marmor poliert Wand", - "block.mineralogy.marble_smooth_brick_wall": "Marmor poliert Ziegelmauer", - "block.mineralogy.slate_wall": "Schieferwand", - "block.mineralogy.slate_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.slate_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.slate_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.schist_wall": "Schieferwand", - "block.mineralogy.schist_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.schist_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.schist_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.gneiss_wall": "Gneismauer", - "block.mineralogy.gneiss_brick_wall": "Gneis-Backsteinmauer", - "block.mineralogy.gneiss_smooth_wall": "Gneis polierte Wand", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis polierte Backsteinmauer", - "block.mineralogy.phyllite_wall": "Phyllitwand", - "block.mineralogy.phyllite_brick_wall": "Phyllit-Ziegelmauer", - "block.mineralogy.phyllite_smooth_wall": "Phyllite polierte Wand", - "block.mineralogy.phyllite_smooth_brick_wall": "Phyllite polierte Backsteinmauer", - "block.mineralogy.amphibolite_wall": "Amphibolit Wand", - "block.mineralogy.amphibolite_brick_wall": "Amphibolit-Backsteinmauer", - "block.mineralogy.amphibolite_smooth_wall": "Amphibolit poliert Wand", - "block.mineralogy.amphibolite_smooth_brick_wall": "Amphibolite polierte Backsteinmauer", - "block.mineralogy.andesite_furnace": "Andesit-Ofen", - "block.mineralogy.andesite_brick_furnace": "Andesit-Ziegelofen", - "block.mineralogy.andesite_smooth_furnace": "Andesite polierte Ofen", - "block.mineralogy.andesite_smooth_brick_furnace": "Andesite polierte Ziegelofen", - "block.mineralogy.basalt_furnace": "Basaltmauer", - "block.mineralogy.basalt_brick_furnace": "Basalt-Ziegelofen", - "block.mineralogy.basalt_smooth_furnace": "Basalt polierte Ofen", - "block.mineralogy.basalt_smooth_brick_furnace": "Basalt polierte Ziegelofen", - "block.mineralogy.diorite_furnace": "Dioritwand", - "block.mineralogy.diorite_brick_furnace": "Diorit-Ziegelofen", - "block.mineralogy.diorite_smooth_furnace": "Diorite polierte Ofen", - "block.mineralogy.diorite_smooth_brick_furnace": "Diorite polierte Ziegelofen", - "block.mineralogy.granite_furnace": "Granitwand", - "block.mineralogy.granite_brick_furnace": "Granit-Ziegelofen", - "block.mineralogy.granite_smooth_furnace": "Granit poliert Ofen", - "block.mineralogy.granite_smooth_brick_furnace": "Granit poliert Ziegelofen", - "block.mineralogy.rhyolite_furnace": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_furnace": "Rhyolith-Ziegelofen", - "block.mineralogy.rhyolite_smooth_furnace": "Rhyolith poliert Ofen", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Rhyolith polierte Ziegelofen", - "block.mineralogy.pegmatite_furnace": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_furnace": "Pegmatite-Ziegelofen", - "block.mineralogy.pegmatite_smooth_furnace": "Pegmatite polierte Ofen", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Pegmatite polierte Ziegelofen", - "block.mineralogy.shale_furnace": "Schieferwand", - "block.mineralogy.shale_brick_furnace": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_furnace": "Schiefer poliert Ofen", - "block.mineralogy.shale_smooth_brick_furnace": "Schiefer poliert Ziegelofen", - "block.mineralogy.conglomerate_furnace": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_furnace": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_furnace": "Konglomerat polierte Ofen", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Konglomerat polierte Ziegelofen", - "block.mineralogy.dolomite_furnace": "Dolomitenwand", - "block.mineralogy.dolomite_brick_furnace": "Dolomit-Ziegelofen", - "block.mineralogy.dolomite_smooth_furnace": "Dolomit polierte Ofen", - "block.mineralogy.dolomite_smooth_brick_furnace": "Dolomit polierte Ziegelofen", - "block.mineralogy.limestone_furnace": "Kalksteinmauer", - "block.mineralogy.limestone_brick_furnace": "Kalkstein-Ziegelofen", - "block.mineralogy.limestone_smooth_furnace": "Kalkstein polierte Ofen", - "block.mineralogy.limestone_smooth_brick_furnace": "Kalkstein poliert Ziegelofen", - "block.mineralogy.marble_furnace": "Marmorwand", - "block.mineralogy.marble_brick_furnace": "Marmor Ziegelofen", - "block.mineralogy.marble_smooth_furnace": "Marmor poliert Ofen", - "block.mineralogy.marble_smooth_brick_furnace": "Marmor poliert Ziegelofen", - "block.mineralogy.slate_furnace": "Schieferwand", - "block.mineralogy.slate_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.slate_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.slate_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.schist_furnace": "Schieferwand", - "block.mineralogy.schist_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.schist_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.schist_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.gneiss_furnace": "Gneismauer", - "block.mineralogy.gneiss_brick_furnace": "Gneis-Ziegelofen", - "block.mineralogy.gneiss_smooth_furnace": "Gneis polierte Ofen", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis polierte Ziegelofen", - "block.mineralogy.phyllite_furnace": "Phyllitwand", - "block.mineralogy.phyllite_brick_furnace": "Phyllit-Ziegelofen", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite polierte Ofen", - "block.mineralogy.phyllite_smooth_brick_furnace": "Phyllite polierte Ziegelofen", - "block.mineralogy.amphibolite_furnace": "Amphibolit Ofen", - "block.mineralogy.amphibolite_brick_furnace": "Amphibolit-Ziegelofen", - "block.mineralogy.amphibolite_smooth_furnace": "Amphibolit poliert Ofen", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Amphibolite polierte Ziegelofen", + "block.mineralogy.nitrate_ore": "Nitraterz", + "block.mineralogy.drywall_black": "Gipskartonplatte (Schwarz)", + "block.mineralogy.drywall_red": "Gipskartonplatte (Rot)", + "block.mineralogy.drywall_green": "Gipskartonplatte (Grün)", + "block.mineralogy.drywall_brown": "Gipskartonplatte (Braun)", + "block.mineralogy.drywall_blue": "Gipskartonplatte (Blau)", + "block.mineralogy.drywall_purple": "Gipskartonplatte (Violett)", + "block.mineralogy.drywall_cyan": "Gipskartonplatte (Türkis)", + "block.mineralogy.drywall_silver": "Gipskartonplatte (Hellgrau)", + "block.mineralogy.drywall_gray": "Gipskartonplatte (Grau)", + "block.mineralogy.drywall_pink": "Gipskartonplatte (Rosa)", + "block.mineralogy.drywall_lime": "Gipskartonplatte (Hellgrün)", + "block.mineralogy.drywall_yellow": "Gipskartonplatte (Gelb)", + "block.mineralogy.drywall_light_blue": "Gipskartonplatte (Hellblau)", + "block.mineralogy.drywall_magenta": "Gipskartonplatte (Magenta)", + "block.mineralogy.drywall_orange": "Gipskartonplatte (Orange)", + "block.mineralogy.drywall_white": "Gipskartonplatte (Weiß)", + "block.mineralogy.andesite_wall": "Mauer aus Andesit", + "block.mineralogy.andesite_brick_wall": "Ziegelmauer aus Andesit", + "block.mineralogy.andesite_smooth_wall": "Polierte Mauer aus Andesit", + "block.mineralogy.andesite_smooth_brick_wall": "Polierte Ziegelmauer aus Andesit", + "block.mineralogy.basalt_wall": "Mauer aus Basalt", + "block.mineralogy.basalt_brick_wall": "Ziegelmauer aus Basalt", + "block.mineralogy.basalt_smooth_wall": "Polierte Mauer aus Basalt", + "block.mineralogy.basalt_smooth_brick_wall": "Polierte Ziegelmauer aus Basalt", + "block.mineralogy.diorite_wall": "Mauer aus Diorit", + "block.mineralogy.diorite_brick_wall": "Ziegelmauer aus Diorit", + "block.mineralogy.diorite_smooth_wall": "Polierte Mauer aus Diorit", + "block.mineralogy.diorite_smooth_brick_wall": "Polierte Ziegelmauer aus Diorit", + "block.mineralogy.granite_wall": "Mauer aus Granit", + "block.mineralogy.granite_brick_wall": "Ziegelmauer aus Granit", + "block.mineralogy.granite_smooth_wall": "Polierte Mauer aus Granit", + "block.mineralogy.granite_smooth_brick_wall": "Polierte Ziegelmauer aus Granit", + "block.mineralogy.rhyolite_wall": "Mauer aus Rhyolith", + "block.mineralogy.rhyolite_brick_wall": "Ziegelmauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_wall": "Polierte Mauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_wall": "Polierte Ziegelmauer aus Rhyolith", + "block.mineralogy.pegmatite_wall": "Mauer aus Pegmatit", + "block.mineralogy.pegmatite_brick_wall": "Ziegelmauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_wall": "Polierte Mauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_wall": "Polierte Ziegelmauer aus Pegmatit", + "block.mineralogy.shale_wall": "Mauer aus Tonschiefer", + "block.mineralogy.shale_brick_wall": "Ziegelmauer aus Tonschiefer", + "block.mineralogy.shale_smooth_wall": "Polierte Mauer aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_wall": "Polierte Ziegelmauer aus Tonschiefer", + "block.mineralogy.conglomerate_wall": "Mauer aus Konglomerat", + "block.mineralogy.conglomerate_brick_wall": "Ziegelmauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_wall": "Polierte Mauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Polierte Ziegelmauer aus Konglomerat", + "block.mineralogy.dolomite_wall": "Mauer aus Dolomit", + "block.mineralogy.dolomite_brick_wall": "Ziegelmauer aus Dolomit", + "block.mineralogy.dolomite_smooth_wall": "Polierte Mauer aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_wall": "Polierte Ziegelmauer aus Dolomit", + "block.mineralogy.limestone_wall": "Mauer aus Kalkstein", + "block.mineralogy.limestone_brick_wall": "Ziegelmauer aus Kalkstein", + "block.mineralogy.limestone_smooth_wall": "Polierte Mauer aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_wall": "Polierte Ziegelmauer aus Kalkstein", + "block.mineralogy.marble_wall": "Mauer aus Marmor", + "block.mineralogy.marble_brick_wall": "Ziegelmauer aus Marmor", + "block.mineralogy.marble_smooth_wall": "Polierte Mauer aus Marmor", + "block.mineralogy.marble_smooth_brick_wall": "Polierte Ziegelmauer aus Marmor", + "block.mineralogy.slate_wall": "Mauer aus Schiefer", + "block.mineralogy.slate_brick_wall": "Ziegelmauer aus Schiefer", + "block.mineralogy.slate_smooth_wall": "Polierte Mauer aus Schiefer", + "block.mineralogy.slate_smooth_brick_wall": "Polierte Ziegelmauer aus Schiefer", + "block.mineralogy.schist_wall": "Mauer aus Glimmerschiefer", + "block.mineralogy.schist_brick_wall": "Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_wall": "Polierte Mauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_wall": "Polierte Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.gneiss_wall": "Mauer aus Gneis", + "block.mineralogy.gneiss_brick_wall": "Ziegelmauer aus Gneis", + "block.mineralogy.gneiss_smooth_wall": "Polierte Mauer aus Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Polierte Ziegelmauer aus Gneis", + "block.mineralogy.phyllite_wall": "Mauer aus Phyllit", + "block.mineralogy.phyllite_brick_wall": "Ziegelmauer aus Phyllit", + "block.mineralogy.phyllite_smooth_wall": "Polierte Mauer aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_wall": "Polierte Ziegelmauer aus Phyllit", + "block.mineralogy.amphibolite_wall": "Mauer aus Amphibolit", + "block.mineralogy.amphibolite_brick_wall": "Ziegelmauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_wall": "Polierte Mauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_wall": "Polierte Ziegelmauer aus Amphibolit", + "block.mineralogy.andesite_furnace": "Ofen aus Andesit", + "block.mineralogy.andesite_brick_furnace": "Ziegelofen aus Andesit", + "block.mineralogy.andesite_smooth_furnace": "Polierter Ofen aus Andesit", + "block.mineralogy.andesite_smooth_brick_furnace": "Polierter Ziegelofen aus Andesit", + "block.mineralogy.basalt_furnace": "Ofen aus Basalt", + "block.mineralogy.basalt_brick_furnace": "Ziegelofen aus Basalt", + "block.mineralogy.basalt_smooth_furnace": "Polierter Ofen aus Basalt", + "block.mineralogy.basalt_smooth_brick_furnace": "Polierter Ziegelofen aus Basalt", + "block.mineralogy.diorite_furnace": "Ofen aus Diorit", + "block.mineralogy.diorite_brick_furnace": "Ziegelofen aus Diorit", + "block.mineralogy.diorite_smooth_furnace": "Polierter Ofen aus Diorit", + "block.mineralogy.diorite_smooth_brick_furnace": "Polierter Ziegelofen aus Diorit", + "block.mineralogy.granite_furnace": "Ofen aus Granit", + "block.mineralogy.granite_brick_furnace": "Ziegelofen aus Granit", + "block.mineralogy.granite_smooth_furnace": "Polierter Ofen aus Granit", + "block.mineralogy.granite_smooth_brick_furnace": "Polierter Ziegelofen aus Granit", + "block.mineralogy.rhyolite_furnace": "Ofen aus Rhyolith", + "block.mineralogy.rhyolite_brick_furnace": "Ziegelofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_furnace": "Polierter Ofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Polierter Ziegelofen aus Rhyolith", + "block.mineralogy.pegmatite_furnace": "Ofen aus Pegmatit", + "block.mineralogy.pegmatite_brick_furnace": "Ziegelofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_furnace": "Polierter Ofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Polierter Ziegelofen aus Pegmatit", + "block.mineralogy.shale_furnace": "Ofen aus Tonschiefer", + "block.mineralogy.shale_brick_furnace": "Ziegelofen aus Tonschiefer", + "block.mineralogy.shale_smooth_furnace": "Polierter Ofen aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_furnace": "Polierter Ziegelofen aus Tonschiefer", + "block.mineralogy.conglomerate_furnace": "Ofen aus Konglomerat", + "block.mineralogy.conglomerate_brick_furnace": "Ziegelofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_furnace": "Polierter Ofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Polierter Ziegelofen aus Konglomerat", + "block.mineralogy.dolomite_furnace": "Ofen aus Dolomit", + "block.mineralogy.dolomite_brick_furnace": "Ziegelofen aus Dolomit", + "block.mineralogy.dolomite_smooth_furnace": "Polierter Ofen aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_furnace": "Polierter Ziegelofen aus Dolomit", + "block.mineralogy.limestone_furnace": "Ofen aus Kalkstein", + "block.mineralogy.limestone_brick_furnace": "Ziegelofen aus Kalkstein", + "block.mineralogy.limestone_smooth_furnace": "Polierter Ofen aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_furnace": "Polierter Ziegelofen aus Kalkstein", + "block.mineralogy.marble_furnace": "Ofen aus Marmor", + "block.mineralogy.marble_brick_furnace": "Ziegelofen aus Marmor", + "block.mineralogy.marble_smooth_furnace": "Polierter Ofen aus Marmor", + "block.mineralogy.marble_smooth_brick_furnace": "Polierter Ziegelofen aus Marmor", + "block.mineralogy.slate_furnace": "Ofen aus Schiefer", + "block.mineralogy.slate_brick_furnace": "Ziegelofen aus Schiefer", + "block.mineralogy.slate_smooth_furnace": "Polierter Ofen aus Schiefer", + "block.mineralogy.slate_smooth_brick_furnace": "Polierter Ziegelofen aus Schiefer", + "block.mineralogy.schist_furnace": "Ofen aus Glimmerschiefer", + "block.mineralogy.schist_brick_furnace": "Ziegelofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_furnace": "Polierter Ofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_furnace": "Polierter Ziegelofen aus Glimmerschiefer", + "block.mineralogy.gneiss_furnace": "Ofen aus Gneis", + "block.mineralogy.gneiss_brick_furnace": "Ziegelofen aus Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Polierter Ofen aus Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Polierter Ziegelofen aus Gneis", + "block.mineralogy.phyllite_furnace": "Ofen aus Phyllit", + "block.mineralogy.phyllite_brick_furnace": "Ziegelofen aus Phyllit", + "block.mineralogy.phyllite_smooth_furnace": "Polierter Ofen aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_furnace": "Polierter Ziegelofen aus Phyllit", + "block.mineralogy.amphibolite_furnace": "Ofen aus Amphibolit", + "block.mineralogy.amphibolite_brick_furnace": "Ziegelofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_furnace": "Polierter Ofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Polierter Ziegelofen aus Amphibolit", "block.mineralogy.diabase": "Diabas", - "block.mineralogy.diabase_stairs": "Diabas Treppe", - "block.mineralogy.diabase_slab": "Diabas Platte", - "block.mineralogy.diabase_brick": "Diabas Backstein", - "block.mineralogy.diabase_brick_stairs": "Diabas Ziegelsteintreppen", - "block.mineralogy.diabase_brick_slab": "Diabas Ziegelplatte", - "block.mineralogy.diabase_smooth": "Polished Diabas", - "block.mineralogy.diabase_smooth_stairs": "Diabas Polierte Treppe", - "block.mineralogy.diabase_smooth_slab": "Diabas Polierte Platte", - "block.mineralogy.diabase_smooth_brick": "Diabas Polierter Ziegelstein", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabas Polierte Ziegelsteintreppen", - "block.mineralogy.diabase_smooth_brick_slab": "Diabas Polierte Ziegelplatte", - "block.mineralogy.diabase_wall": "Diabas Wand", - "block.mineralogy.diabase_brick_wall": "Diabas Ziegelwand", - "block.mineralogy.diabase_smooth_wall": "Diabas Polierte Wand", - "block.mineralogy.diabase_smooth_brick_wall": "Diabas Polierte Backsteinmauer", - "block.mineralogy.diabase_furnace": "Diabas Ofen", - "block.mineralogy.diabase_brick_furnace": "Diabas Ziegelofen", - "block.mineralogy.diabase_smooth_furnace": "Diabas Polierter Ofen", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabas Polierter Ziegelofen", + "block.mineralogy.diabase_stairs": "Treppe aus Diabas", + "block.mineralogy.diabase_slab": "Stufe aus Diabas", + "block.mineralogy.diabase_brick": "Ziegel aus Diabas", + "block.mineralogy.diabase_brick_stairs": "Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_brick_slab": "Ziegelstufe aus Diabas", + "block.mineralogy.diabase_smooth": "Polierter Block aus Diabas", + "block.mineralogy.diabase_smooth_stairs": "Polierte Treppe aus Diabas", + "block.mineralogy.diabase_smooth_slab": "Polierte Stufe aus Diabas", + "block.mineralogy.diabase_smooth_brick": "Polierte Ziegel aus Diabas", + "block.mineralogy.diabase_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_smooth_brick_slab": "Polierte Ziegelstufe aus Diabas", + "block.mineralogy.diabase_wall": "Mauer aus Diabas", + "block.mineralogy.diabase_brick_wall": "Ziegelmauer aus Diabas", + "block.mineralogy.diabase_smooth_wall": "Polierte Mauer aus Diabas", + "block.mineralogy.diabase_smooth_brick_wall": "Polierte Ziegelmauer aus Diabas", + "block.mineralogy.diabase_furnace": "Ofen aus Diabas", + "block.mineralogy.diabase_brick_furnace": "Ziegelofen aus Diabas", + "block.mineralogy.diabase_smooth_furnace": "Polierter Ofen aus Diabas", + "block.mineralogy.diabase_smooth_brick_furnace": "Polierter Ziegelofen aus Diabas", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Treppe", - "block.mineralogy.gabbro_slab": "Gabbro Platte", - "block.mineralogy.gabbro_brick": "Gabbro Backstein", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Ziegelsteintreppen", - "block.mineralogy.gabbro_brick_slab": "Gabbro Ziegelplatte", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Polierte Treppe", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Polierte Platte", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Polierter Ziegelstein", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polierte Ziegelsteintreppen", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polierte Ziegelplatte", - "block.mineralogy.gabbro_wall": "Gabbro Wand", - "block.mineralogy.gabbro_brick_wall": "Gabbro Ziegelwand", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Polierte Wand", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Polierte Backsteinmauer", - "block.mineralogy.gabbro_furnace": "Gabbro Ofen", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Ziegelofen", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Polierter Ofen", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Polierter Ziegelofen", + "block.mineralogy.gabbro_stairs": "Treppe aus Gabbro", + "block.mineralogy.gabbro_slab": "Stufe aus Gabbro", + "block.mineralogy.gabbro_brick": "Ziegel aus Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_brick_slab": "Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_smooth": "Polierter Block aus Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Polierte Treppe aus Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Polierte Stufe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Polierte Ziegel aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Polierte Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_wall": "Mauer aus Gabbro", + "block.mineralogy.gabbro_brick_wall": "Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Polierte Mauer aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Polierte Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_furnace": "Ofen aus Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Ziegelofen aus Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Polierter Ofen aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Polierter Ziegelofen aus Gabbro", "block.mineralogy.peridotite": "Peridotit", - "block.mineralogy.peridotite_stairs": "Peridotit Treppe", - "block.mineralogy.peridotite_slab": "Peridotit Platte", - "block.mineralogy.peridotite_brick": "Peridotit Backstein", - "block.mineralogy.peridotite_brick_stairs": "Peridotit Ziegelsteintreppen", - "block.mineralogy.peridotite_brick_slab": "Peridotit Ziegelplatte", - "block.mineralogy.peridotite_smooth": "Polished Peridotit", - "block.mineralogy.peridotite_smooth_stairs": "Peridotit Polierte Treppe", - "block.mineralogy.peridotite_smooth_slab": "Peridotit Polierte Platte", - "block.mineralogy.peridotite_smooth_brick": "Peridotit Polierter Ziegelstein", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotit Polierte Ziegelsteintreppen", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotit Polierte Ziegelplatte", - "block.mineralogy.peridotite_wall": "Peridotit Wand", - "block.mineralogy.peridotite_brick_wall": "Peridotit Ziegelwand", - "block.mineralogy.peridotite_smooth_wall": "Peridotit Polierte Wand", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotit Polierte Backsteinmauer", - "block.mineralogy.peridotite_furnace": "Peridotit Ofen", - "block.mineralogy.peridotite_brick_furnace": "Peridotit Ziegelofen", - "block.mineralogy.peridotite_smooth_furnace": "Peridotit Polierter Ofen", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotit Polierter Ziegelofen", + "block.mineralogy.peridotite_stairs": "Treppe aus Peridotit", + "block.mineralogy.peridotite_slab": "Stufe aus Peridotit", + "block.mineralogy.peridotite_brick": "Ziegel aus Peridotit", + "block.mineralogy.peridotite_brick_stairs": "Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_brick_slab": "Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_smooth": "Polierter Block aus Peridotit", + "block.mineralogy.peridotite_smooth_stairs": "Polierte Treppe aus Peridotit", + "block.mineralogy.peridotite_smooth_slab": "Polierte Stufe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick": "Polierte Ziegel aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_slab": "Polierte Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_wall": "Mauer aus Peridotit", + "block.mineralogy.peridotite_brick_wall": "Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_smooth_wall": "Polierte Mauer aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_wall": "Polierte Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_furnace": "Ofen aus Peridotit", + "block.mineralogy.peridotite_brick_furnace": "Ziegelofen aus Peridotit", + "block.mineralogy.peridotite_smooth_furnace": "Polierter Ofen aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_furnace": "Polierter Ziegelofen aus Peridotit", "block.mineralogy.basaltic_glass": "Basaltglas", - "block.mineralogy.basaltic_glass_stairs": "Basaltglas Treppe", - "block.mineralogy.basaltic_glass_slab": "Basaltglas Platte", - "block.mineralogy.basaltic_glass_brick": "Basaltglas Backstein", - "block.mineralogy.basaltic_glass_brick_stairs": "Basaltglas Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_brick_slab": "Basaltglas Ziegelplatte", - "block.mineralogy.basaltic_glass_smooth": "Polished Basaltglas", - "block.mineralogy.basaltic_glass_smooth_stairs": "Basaltglas Polierte Treppe", - "block.mineralogy.basaltic_glass_smooth_slab": "Basaltglas Polierte Platte", - "block.mineralogy.basaltic_glass_smooth_brick": "Basaltglas Polierter Ziegelstein", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Basaltglas Polierte Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Basaltglas Polierte Ziegelplatte", - "block.mineralogy.basaltic_glass_wall": "Basaltglas Wand", - "block.mineralogy.basaltic_glass_brick_wall": "Basaltglas Ziegelwand", - "block.mineralogy.basaltic_glass_smooth_wall": "Basaltglas Polierte Wand", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Basaltglas Polierte Backsteinmauer", - "block.mineralogy.basaltic_glass_furnace": "Basaltglas Ofen", - "block.mineralogy.basaltic_glass_brick_furnace": "Basaltglas Ziegelofen", - "block.mineralogy.basaltic_glass_smooth_furnace": "Basaltglas Polierter Ofen", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Basaltglas Polierter Ziegelofen", - "block.mineralogy.scoria": "Schlacke", - "block.mineralogy.scoria_stairs": "Schlacke Treppe", - "block.mineralogy.scoria_slab": "Schlacke Platte", - "block.mineralogy.scoria_brick": "Schlacke Backstein", - "block.mineralogy.scoria_brick_stairs": "Schlacke Ziegelsteintreppen", - "block.mineralogy.scoria_brick_slab": "Schlacke Ziegelplatte", - "block.mineralogy.scoria_smooth": "Polished Schlacke", - "block.mineralogy.scoria_smooth_stairs": "Schlacke Polierte Treppe", - "block.mineralogy.scoria_smooth_slab": "Schlacke Polierte Platte", - "block.mineralogy.scoria_smooth_brick": "Schlacke Polierter Ziegelstein", - "block.mineralogy.scoria_smooth_brick_stairs": "Schlacke Polierte Ziegelsteintreppen", - "block.mineralogy.scoria_smooth_brick_slab": "Schlacke Polierte Ziegelplatte", - "block.mineralogy.scoria_wall": "Schlacke Wand", - "block.mineralogy.scoria_brick_wall": "Schlacke Ziegelwand", - "block.mineralogy.scoria_smooth_wall": "Schlacke Polierte Wand", - "block.mineralogy.scoria_smooth_brick_wall": "Schlacke Polierte Backsteinmauer", - "block.mineralogy.scoria_furnace": "Schlacke Ofen", - "block.mineralogy.scoria_brick_furnace": "Schlacke Ziegelofen", - "block.mineralogy.scoria_smooth_furnace": "Schlacke Polierter Ofen", - "block.mineralogy.scoria_smooth_brick_furnace": "Schlacke Polierter Ziegelofen", - "block.mineralogy.tuff": "Tuff", - "block.mineralogy.tuff_stairs": "Tuff Treppe", - "block.mineralogy.tuff_slab": "Tuff Platte", - "block.mineralogy.tuff_brick": "Tuff Backstein", - "block.mineralogy.tuff_brick_stairs": "Tuff Ziegelsteintreppen", - "block.mineralogy.tuff_brick_slab": "Tuff Ziegelplatte", - "block.mineralogy.tuff_smooth": "Polished Tuff", - "block.mineralogy.tuff_smooth_stairs": "Tuff Polierte Treppe", - "block.mineralogy.tuff_smooth_slab": "Tuff Polierte Platte", - "block.mineralogy.tuff_smooth_brick": "Tuff Polierter Ziegelstein", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuff Polierte Ziegelsteintreppen", - "block.mineralogy.tuff_smooth_brick_slab": "Tuff Polierte Ziegelplatte", - "block.mineralogy.tuff_wall": "Tuff Wand", - "block.mineralogy.tuff_brick_wall": "Tuff Ziegelwand", - "block.mineralogy.tuff_smooth_wall": "Tuff Polierte Wand", - "block.mineralogy.tuff_smooth_brick_wall": "Tuff Polierte Backsteinmauer", - "block.mineralogy.tuff_furnace": "Tuff Ofen", - "block.mineralogy.tuff_brick_furnace": "Tuff Ziegelofen", - "block.mineralogy.tuff_smooth_furnace": "Tuff Polierter Ofen", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuff Polierter Ziegelofen", + "block.mineralogy.basaltic_glass_stairs": "Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_slab": "Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick": "Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_stairs": "Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_slab": "Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth": "Polierter Block aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_stairs": "Polierte Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_slab": "Polierte Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick": "Polierte Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Polierte Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_wall": "Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_wall": "Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_wall": "Polierte Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Polierte Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_furnace": "Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_furnace": "Ziegelofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_furnace": "Polierter Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Polierter Ziegelofen aus Basaltglas", + "block.mineralogy.scoria": "Skoria", + "block.mineralogy.scoria_stairs": "Treppe aus Skoria", + "block.mineralogy.scoria_slab": "Stufe aus Skoria", + "block.mineralogy.scoria_brick": "Ziegel aus Skoria", + "block.mineralogy.scoria_brick_stairs": "Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_brick_slab": "Ziegelstufe aus Skoria", + "block.mineralogy.scoria_smooth": "Polierter Block aus Skoria", + "block.mineralogy.scoria_smooth_stairs": "Polierte Treppe aus Skoria", + "block.mineralogy.scoria_smooth_slab": "Polierte Stufe aus Skoria", + "block.mineralogy.scoria_smooth_brick": "Polierte Ziegel aus Skoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Polierte Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_smooth_brick_slab": "Polierte Ziegelstufe aus Skoria", + "block.mineralogy.scoria_wall": "Mauer aus Skoria", + "block.mineralogy.scoria_brick_wall": "Ziegelmauer aus Skoria", + "block.mineralogy.scoria_smooth_wall": "Polierte Mauer aus Skoria", + "block.mineralogy.scoria_smooth_brick_wall": "Polierte Ziegelmauer aus Skoria", + "block.mineralogy.scoria_furnace": "Ofen aus Skoria", + "block.mineralogy.scoria_brick_furnace": "Ziegelofen aus Skoria", + "block.mineralogy.scoria_smooth_furnace": "Polierter Ofen aus Skoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Polierter Ziegelofen aus Skoria", + "block.mineralogy.tuff": "Tuffstein", + "block.mineralogy.tuff_stairs": "Treppe aus Tuffstein", + "block.mineralogy.tuff_slab": "Stufe aus Tuffstein", + "block.mineralogy.tuff_brick": "Ziegel aus Tuffstein", + "block.mineralogy.tuff_brick_stairs": "Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_brick_slab": "Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_smooth": "Polierter Block aus Tuffstein", + "block.mineralogy.tuff_smooth_stairs": "Polierte Treppe aus Tuffstein", + "block.mineralogy.tuff_smooth_slab": "Polierte Stufe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick": "Polierte Ziegel aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_slab": "Polierte Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_wall": "Mauer aus Tuffstein", + "block.mineralogy.tuff_brick_wall": "Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_smooth_wall": "Polierte Mauer aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_wall": "Polierte Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_furnace": "Ofen aus Tuffstein", + "block.mineralogy.tuff_brick_furnace": "Ziegelofen aus Tuffstein", + "block.mineralogy.tuff_smooth_furnace": "Polierter Ofen aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_furnace": "Polierter Ziegelofen aus Tuffstein", "block.mineralogy.siltstone": "Schluffstein", - "block.mineralogy.siltstone_stairs": "Schluffstein Treppe", - "block.mineralogy.siltstone_slab": "Schluffstein Platte", - "block.mineralogy.siltstone_brick": "Schluffstein Backstein", - "block.mineralogy.siltstone_brick_stairs": "Schluffstein Ziegelsteintreppen", - "block.mineralogy.siltstone_brick_slab": "Schluffstein Ziegelplatte", - "block.mineralogy.siltstone_smooth": "Polished Schluffstein", - "block.mineralogy.siltstone_smooth_stairs": "Schluffstein Polierte Treppe", - "block.mineralogy.siltstone_smooth_slab": "Schluffstein Polierte Platte", - "block.mineralogy.siltstone_smooth_brick": "Schluffstein Polierter Ziegelstein", - "block.mineralogy.siltstone_smooth_brick_stairs": "Schluffstein Polierte Ziegelsteintreppen", - "block.mineralogy.siltstone_smooth_brick_slab": "Schluffstein Polierte Ziegelplatte", - "block.mineralogy.siltstone_wall": "Schluffstein Wand", - "block.mineralogy.siltstone_brick_wall": "Schluffstein Ziegelwand", - "block.mineralogy.siltstone_smooth_wall": "Schluffstein Polierte Wand", - "block.mineralogy.siltstone_smooth_brick_wall": "Schluffstein Polierte Backsteinmauer", - "block.mineralogy.siltstone_furnace": "Schluffstein Ofen", - "block.mineralogy.siltstone_brick_furnace": "Schluffstein Ziegelofen", - "block.mineralogy.siltstone_smooth_furnace": "Schluffstein Polierter Ofen", - "block.mineralogy.siltstone_smooth_brick_furnace": "Schluffstein Polierter Ziegelofen", + "block.mineralogy.siltstone_stairs": "Treppe aus Schluffstein", + "block.mineralogy.siltstone_slab": "Stufe aus Schluffstein", + "block.mineralogy.siltstone_brick": "Ziegel aus Schluffstein", + "block.mineralogy.siltstone_brick_stairs": "Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_brick_slab": "Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_smooth": "Polierter Block aus Schluffstein", + "block.mineralogy.siltstone_smooth_stairs": "Polierte Treppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_slab": "Polierte Stufe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick": "Polierte Ziegel aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_slab": "Polierte Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_wall": "Mauer aus Schluffstein", + "block.mineralogy.siltstone_brick_wall": "Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_wall": "Polierte Mauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_wall": "Polierte Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_furnace": "Ofen aus Schluffstein", + "block.mineralogy.siltstone_brick_furnace": "Ziegelofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_furnace": "Polierter Ofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_furnace": "Polierter Ziegelofen aus Schluffstein", "block.mineralogy.rock_salt": "Steinsalz", - "block.mineralogy.rock_salt_stairs": "Steinsalz Treppe", - "block.mineralogy.rock_salt_slab": "Steinsalz Platte", - "block.mineralogy.rock_salt_brick": "Steinsalz Backstein", - "block.mineralogy.rock_salt_brick_stairs": "Steinsalz Ziegelsteintreppen", - "block.mineralogy.rock_salt_brick_slab": "Steinsalz Ziegelplatte", - "block.mineralogy.rock_salt_smooth": "Polished Steinsalz", - "block.mineralogy.rock_salt_smooth_stairs": "Steinsalz Polierte Treppe", - "block.mineralogy.rock_salt_smooth_slab": "Steinsalz Polierte Platte", - "block.mineralogy.rock_salt_smooth_brick": "Steinsalz Polierter Ziegelstein", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Steinsalz Polierte Ziegelsteintreppen", - "block.mineralogy.rock_salt_smooth_brick_slab": "Steinsalz Polierte Ziegelplatte", - "block.mineralogy.rock_salt_wall": "Steinsalz Wand", - "block.mineralogy.rock_salt_brick_wall": "Steinsalz Ziegelwand", - "block.mineralogy.rock_salt_smooth_wall": "Steinsalz Polierte Wand", - "block.mineralogy.rock_salt_smooth_brick_wall": "Steinsalz Polierte Backsteinmauer", - "block.mineralogy.rock_salt_furnace": "Steinsalz Ofen", - "block.mineralogy.rock_salt_brick_furnace": "Steinsalz Ziegelofen", - "block.mineralogy.rock_salt_smooth_furnace": "Steinsalz Polierter Ofen", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Steinsalz Polierter Ziegelofen", + "block.mineralogy.rock_salt_stairs": "Treppe aus Steinsalz", + "block.mineralogy.rock_salt_slab": "Stufe aus Steinsalz", + "block.mineralogy.rock_salt_brick": "Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_brick_stairs": "Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_brick_slab": "Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth": "Polierter Block aus Steinsalz", + "block.mineralogy.rock_salt_smooth_stairs": "Polierte Treppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_slab": "Polierte Stufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick": "Polierte Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_slab": "Polierte Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_wall": "Mauer aus Steinsalz", + "block.mineralogy.rock_salt_brick_wall": "Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_wall": "Polierte Mauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_wall": "Polierte Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_furnace": "Ofen aus Steinsalz", + "block.mineralogy.rock_salt_brick_furnace": "Ziegelofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_furnace": "Polierter Ofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Polierter Ziegelofen aus Steinsalz", "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Treppe", - "block.mineralogy.hornfels_slab": "Hornfels Platte", - "block.mineralogy.hornfels_brick": "Hornfels Backstein", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Ziegelsteintreppen", - "block.mineralogy.hornfels_brick_slab": "Hornfels Ziegelplatte", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Polierte Treppe", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Polierte Platte", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Polierter Ziegelstein", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polierte Ziegelsteintreppen", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polierte Ziegelplatte", - "block.mineralogy.hornfels_wall": "Hornfels Wand", - "block.mineralogy.hornfels_brick_wall": "Hornfels Ziegelwand", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Polierte Wand", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Polierte Backsteinmauer", - "block.mineralogy.hornfels_furnace": "Hornfels Ofen", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Ziegelofen", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Polierter Ofen", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Polierter Ziegelofen", + "block.mineralogy.hornfels_stairs": "Treppe aus Hornfels", + "block.mineralogy.hornfels_slab": "Stufe aus Hornfels", + "block.mineralogy.hornfels_brick": "Ziegel aus Hornfels", + "block.mineralogy.hornfels_brick_stairs": "Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_brick_slab": "Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_smooth": "Polierter Block aus Hornfels", + "block.mineralogy.hornfels_smooth_stairs": "Polierte Treppe aus Hornfels", + "block.mineralogy.hornfels_smooth_slab": "Polierte Stufe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick": "Polierte Ziegel aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_stairs": "Polierte Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_slab": "Polierte Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_wall": "Mauer aus Hornfels", + "block.mineralogy.hornfels_brick_wall": "Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_smooth_wall": "Polierte Mauer aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_wall": "Polierte Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_furnace": "Ofen aus Hornfels", + "block.mineralogy.hornfels_brick_furnace": "Ziegelofen aus Hornfels", + "block.mineralogy.hornfels_smooth_furnace": "Polierter Ofen aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_furnace": "Polierter Ziegelofen aus Hornfels", "block.mineralogy.quartzite": "Quarzit", - "block.mineralogy.quartzite_stairs": "Quarzit Treppe", - "block.mineralogy.quartzite_slab": "Quarzit Platte", - "block.mineralogy.quartzite_brick": "Quarzit Backstein", - "block.mineralogy.quartzite_brick_stairs": "Quarzit Ziegelsteintreppen", - "block.mineralogy.quartzite_brick_slab": "Quarzit Ziegelplatte", - "block.mineralogy.quartzite_smooth": "Polished Quarzit", - "block.mineralogy.quartzite_smooth_stairs": "Quarzit Polierte Treppe", - "block.mineralogy.quartzite_smooth_slab": "Quarzit Polierte Platte", - "block.mineralogy.quartzite_smooth_brick": "Quarzit Polierter Ziegelstein", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quarzit Polierte Ziegelsteintreppen", - "block.mineralogy.quartzite_smooth_brick_slab": "Quarzit Polierte Ziegelplatte", - "block.mineralogy.quartzite_wall": "Quarzit Wand", - "block.mineralogy.quartzite_brick_wall": "Quarzit Ziegelwand", - "block.mineralogy.quartzite_smooth_wall": "Quarzit Polierte Wand", - "block.mineralogy.quartzite_smooth_brick_wall": "Quarzit Polierte Backsteinmauer", - "block.mineralogy.quartzite_furnace": "Quarzit Ofen", - "block.mineralogy.quartzite_brick_furnace": "Quarzit Ziegelofen", - "block.mineralogy.quartzite_smooth_furnace": "Quarzit Polierter Ofen", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quarzit Polierter Ziegelofen", - "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Treppe", - "block.mineralogy.novaculite_slab": "Novaculite Platte", - "block.mineralogy.novaculite_brick": "Novaculite Backstein", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Ziegelsteintreppen", - "block.mineralogy.novaculite_brick_slab": "Novaculite Ziegelplatte", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Polierte Treppe", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Polierte Platte", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Polierter Ziegelstein", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Polierte Ziegelsteintreppen", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Polierte Ziegelplatte", - "block.mineralogy.novaculite_wall": "Novaculite Wand", - "block.mineralogy.novaculite_brick_wall": "Novaculite Ziegelwand", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Polierte Wand", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Polierte Backsteinmauer", - "block.mineralogy.novaculite_furnace": "Novaculite Ofen", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Ziegelofen", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Polierter Ofen", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Polierter Ziegelofen", + "block.mineralogy.quartzite_stairs": "Treppe aus Quarzit", + "block.mineralogy.quartzite_slab": "Stufe aus Quarzit", + "block.mineralogy.quartzite_brick": "Ziegel aus Quarzit", + "block.mineralogy.quartzite_brick_stairs": "Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_brick_slab": "Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_smooth": "Polierter Block aus Quarzit", + "block.mineralogy.quartzite_smooth_stairs": "Polierte Treppe aus Quarzit", + "block.mineralogy.quartzite_smooth_slab": "Polierte Stufe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick": "Polierte Ziegel aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_slab": "Polierte Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_wall": "Mauer aus Quarzit", + "block.mineralogy.quartzite_brick_wall": "Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_smooth_wall": "Polierte Mauer aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_wall": "Polierte Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_furnace": "Ofen aus Quarzit", + "block.mineralogy.quartzite_brick_furnace": "Ziegelofen aus Quarzit", + "block.mineralogy.quartzite_smooth_furnace": "Polierter Ofen aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_furnace": "Polierter Ziegelofen aus Quarzit", + "block.mineralogy.novaculite": "Novakulit", + "block.mineralogy.novaculite_stairs": "Treppe aus Novakulit", + "block.mineralogy.novaculite_slab": "Stufe aus Novakulit", + "block.mineralogy.novaculite_brick": "Ziegel aus Novakulit", + "block.mineralogy.novaculite_brick_stairs": "Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_brick_slab": "Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_smooth": "Polierter Block aus Novakulit", + "block.mineralogy.novaculite_smooth_stairs": "Polierte Treppe aus Novakulit", + "block.mineralogy.novaculite_smooth_slab": "Polierte Stufe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick": "Polierte Ziegel aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_slab": "Polierte Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_wall": "Mauer aus Novakulit", + "block.mineralogy.novaculite_brick_wall": "Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_smooth_wall": "Polierte Mauer aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_wall": "Polierte Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_furnace": "Ofen aus Novakulit", + "block.mineralogy.novaculite_brick_furnace": "Ziegelofen aus Novakulit", + "block.mineralogy.novaculite_smooth_furnace": "Polierter Ofen aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_furnace": "Polierter Ziegelofen aus Novakulit", "block.mineralogy.chalk": "Kreide", - "item.mineralogy.chalk_dust": "Kreide Pulver", + "item.mineralogy.chalk_dust": "Kreidepulver", "item.mineralogy.salt_dust": "Salz", - "item.mineralogy.rock_salt_dust": "Steinsalz-Kristalle", - "block.mineralogy.rocksaltlamp": "Steinsalz-Lampe", + "item.mineralogy.rock_salt_dust": "Steinsalzkristalle", + "block.mineralogy.rocksaltlamp": "Steinsalzlampe", "block.mineralogy.rocksaltstreetlamp": "Steinsalz-Straßenlaterne", - "block.mineralogy.andesite_relief_axe": "Andesit Axe Relief", - "block.mineralogy.andesite_relief_blank": "Andesit Leere Erleichterung", - "block.mineralogy.andesite_relief_cross": "Andesit Cross Relief", - "block.mineralogy.andesite_relief_hammer": "Andesit Hammer Relief", - "block.mineralogy.andesite_relief_hoe": "Andesit Hacke Erleichterung", - "block.mineralogy.andesite_relief_horizontal": "Andesit Horizontales Relief", - "block.mineralogy.andesite_relief_i": "Andesit I Relief", - "block.mineralogy.andesite_relief_left": "Andesit Relief links", - "block.mineralogy.andesite_relief_pickaxe": "Andesit Spitzhacke Relief", - "block.mineralogy.andesite_relief_plus": "Andesit Plus Relief", - "block.mineralogy.andesite_relief_right": "Andesit Rechte Erleichterung", - "block.mineralogy.andesite_relief_sword": "Andesit Schwert Relief", - "block.mineralogy.andesite_relief_vertical": "Andesit Vertikales Relief", - "block.mineralogy.basalt_relief_axe": "Basalt Axe Relief", - "block.mineralogy.basalt_relief_blank": "Basalt Leere Erleichterung", - "block.mineralogy.basalt_relief_cross": "Basalt Cross Relief", - "block.mineralogy.basalt_relief_hammer": "Basalt Hammer Relief", - "block.mineralogy.basalt_relief_hoe": "Basalt Hacke Erleichterung", - "block.mineralogy.basalt_relief_horizontal": "Basalt Horizontales Relief", - "block.mineralogy.basalt_relief_i": "Basalt I Relief", - "block.mineralogy.basalt_relief_left": "Basalt Relief links", - "block.mineralogy.basalt_relief_pickaxe": "Basalt Spitzhacke Relief", - "block.mineralogy.basalt_relief_plus": "Basalt Plus Relief", - "block.mineralogy.basalt_relief_right": "Basalt Rechte Erleichterung", - "block.mineralogy.basalt_relief_sword": "Basalt Schwert Relief", - "block.mineralogy.basalt_relief_vertical": "Basalt Vertikales Relief", - "block.mineralogy.diorite_relief_axe": "Diorit Axe Relief", - "block.mineralogy.diorite_relief_blank": "Diorit Leere Erleichterung", - "block.mineralogy.diorite_relief_cross": "Diorit Cross Relief", - "block.mineralogy.diorite_relief_hammer": "Diorit Hammer Relief", - "block.mineralogy.diorite_relief_hoe": "Diorit Hacke Erleichterung", - "block.mineralogy.diorite_relief_horizontal": "Diorit Horizontales Relief", - "block.mineralogy.diorite_relief_i": "Diorit I Relief", - "block.mineralogy.diorite_relief_left": "Diorit Relief links", - "block.mineralogy.diorite_relief_pickaxe": "Diorit Spitzhacke Relief", - "block.mineralogy.diorite_relief_plus": "Diorit Plus Relief", - "block.mineralogy.diorite_relief_right": "Diorit Rechte Erleichterung", - "block.mineralogy.diorite_relief_sword": "Diorit Schwert Relief", - "block.mineralogy.diorite_relief_vertical": "Diorit Vertikales Relief", - "block.mineralogy.granite_relief_axe": "Granit Axe Relief", - "block.mineralogy.granite_relief_blank": "Granit Leere Erleichterung", - "block.mineralogy.granite_relief_cross": "Granit Cross Relief", - "block.mineralogy.granite_relief_hammer": "Granit Hammer Relief", - "block.mineralogy.granite_relief_hoe": "Granit Hacke Erleichterung", - "block.mineralogy.granite_relief_horizontal": "Granit Horizontales Relief", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief links", - "block.mineralogy.granite_relief_pickaxe": "Granit Spitzhacke Relief", - "block.mineralogy.granite_relief_plus": "Granit Plus Relief", - "block.mineralogy.granite_relief_right": "Granit Rechte Erleichterung", - "block.mineralogy.granite_relief_sword": "Granit Schwert Relief", - "block.mineralogy.granite_relief_vertical": "Granit Vertikales Relief", - "block.mineralogy.rhyolite_relief_axe": "Rhyolith Axe Relief", - "block.mineralogy.rhyolite_relief_blank": "Rhyolith Leere Erleichterung", - "block.mineralogy.rhyolite_relief_cross": "Rhyolith Cross Relief", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolith Hammer Relief", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolith Hacke Erleichterung", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolith Horizontales Relief", - "block.mineralogy.rhyolite_relief_i": "Rhyolith I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolith Relief links", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolith Spitzhacke Relief", - "block.mineralogy.rhyolite_relief_plus": "Rhyolith Plus Relief", - "block.mineralogy.rhyolite_relief_right": "Rhyolith Rechte Erleichterung", - "block.mineralogy.rhyolite_relief_sword": "Rhyolith Schwert Relief", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolith Vertikales Relief", - "block.mineralogy.pegmatite_relief_axe": "Pegmatit Axe Relief", - "block.mineralogy.pegmatite_relief_blank": "Pegmatit Leere Erleichterung", - "block.mineralogy.pegmatite_relief_cross": "Pegmatit Cross Relief", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatit Hammer Relief", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatit Hacke Erleichterung", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatit Horizontales Relief", - "block.mineralogy.pegmatite_relief_i": "Pegmatit I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatit Relief links", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatit Spitzhacke Relief", - "block.mineralogy.pegmatite_relief_plus": "Pegmatit Plus Relief", - "block.mineralogy.pegmatite_relief_right": "Pegmatit Rechte Erleichterung", - "block.mineralogy.pegmatite_relief_sword": "Pegmatit Schwert Relief", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatit Vertikales Relief", - "block.mineralogy.shale_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.shale_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.shale_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.shale_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.shale_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.shale_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.shale_relief_i": "Schiefer I Relief", - "block.mineralogy.shale_relief_left": "Schiefer Relief links", - "block.mineralogy.shale_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.shale_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.shale_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.shale_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.shale_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.conglomerate_relief_axe": "Konglomerat Axe Relief", - "block.mineralogy.conglomerate_relief_blank": "Konglomerat Leere Erleichterung", - "block.mineralogy.conglomerate_relief_cross": "Konglomerat Cross Relief", - "block.mineralogy.conglomerate_relief_hammer": "Konglomerat Hammer Relief", - "block.mineralogy.conglomerate_relief_hoe": "Konglomerat Hacke Erleichterung", - "block.mineralogy.conglomerate_relief_horizontal": "Konglomerat Horizontales Relief", - "block.mineralogy.conglomerate_relief_i": "Konglomerat I Relief", - "block.mineralogy.conglomerate_relief_left": "Konglomerat Relief links", - "block.mineralogy.conglomerate_relief_pickaxe": "Konglomerat Spitzhacke Relief", - "block.mineralogy.conglomerate_relief_plus": "Konglomerat Plus Relief", - "block.mineralogy.conglomerate_relief_right": "Konglomerat Rechte Erleichterung", - "block.mineralogy.conglomerate_relief_sword": "Konglomerat Schwert Relief", - "block.mineralogy.conglomerate_relief_vertical": "Konglomerat Vertikales Relief", - "block.mineralogy.dolomite_relief_axe": "Dolomit Axe Relief", - "block.mineralogy.dolomite_relief_blank": "Dolomit Leere Erleichterung", - "block.mineralogy.dolomite_relief_cross": "Dolomit Cross Relief", - "block.mineralogy.dolomite_relief_hammer": "Dolomit Hammer Relief", - "block.mineralogy.dolomite_relief_hoe": "Dolomit Hacke Erleichterung", - "block.mineralogy.dolomite_relief_horizontal": "Dolomit Horizontales Relief", - "block.mineralogy.dolomite_relief_i": "Dolomit I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomit Relief links", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomit Spitzhacke Relief", - "block.mineralogy.dolomite_relief_plus": "Dolomit Plus Relief", - "block.mineralogy.dolomite_relief_right": "Dolomit Rechte Erleichterung", - "block.mineralogy.dolomite_relief_sword": "Dolomit Schwert Relief", - "block.mineralogy.dolomite_relief_vertical": "Dolomit Vertikales Relief", - "block.mineralogy.limestone_relief_axe": "Kalkstein Axe Relief", - "block.mineralogy.limestone_relief_blank": "Kalkstein Leere Erleichterung", - "block.mineralogy.limestone_relief_cross": "Kalkstein Cross Relief", - "block.mineralogy.limestone_relief_hammer": "Kalkstein Hammer Relief", - "block.mineralogy.limestone_relief_hoe": "Kalkstein Hacke Erleichterung", - "block.mineralogy.limestone_relief_horizontal": "Kalkstein Horizontales Relief", - "block.mineralogy.limestone_relief_i": "Kalkstein I Relief", - "block.mineralogy.limestone_relief_left": "Kalkstein Relief links", - "block.mineralogy.limestone_relief_pickaxe": "Kalkstein Spitzhacke Relief", - "block.mineralogy.limestone_relief_plus": "Kalkstein Plus Relief", - "block.mineralogy.limestone_relief_right": "Kalkstein Rechte Erleichterung", - "block.mineralogy.limestone_relief_sword": "Kalkstein Schwert Relief", - "block.mineralogy.limestone_relief_vertical": "Kalkstein Vertikales Relief", - "block.mineralogy.marble_relief_axe": "Marmor Axe Relief", - "block.mineralogy.marble_relief_blank": "Marmor Leere Erleichterung", - "block.mineralogy.marble_relief_cross": "Marmor Cross Relief", - "block.mineralogy.marble_relief_hammer": "Marmor Hammer Relief", - "block.mineralogy.marble_relief_hoe": "Marmor Hacke Erleichterung", - "block.mineralogy.marble_relief_horizontal": "Marmor Horizontales Relief", - "block.mineralogy.marble_relief_i": "Marmor I Relief", - "block.mineralogy.marble_relief_left": "Marmor Relief links", - "block.mineralogy.marble_relief_pickaxe": "Marmor Spitzhacke Relief", - "block.mineralogy.marble_relief_plus": "Marmor Plus Relief", - "block.mineralogy.marble_relief_right": "Marmor Rechte Erleichterung", - "block.mineralogy.marble_relief_sword": "Marmor Schwert Relief", - "block.mineralogy.marble_relief_vertical": "Marmor Vertikales Relief", - "block.mineralogy.slate_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.slate_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.slate_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.slate_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.slate_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.slate_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.slate_relief_i": "Schiefer I Relief", - "block.mineralogy.slate_relief_left": "Schiefer Relief links", - "block.mineralogy.slate_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.slate_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.slate_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.slate_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.slate_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.schist_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.schist_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.schist_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.schist_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.schist_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.schist_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.schist_relief_i": "Schiefer I Relief", - "block.mineralogy.schist_relief_left": "Schiefer Relief links", - "block.mineralogy.schist_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.schist_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.schist_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.schist_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.schist_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.gneiss_relief_axe": "Gneis Axe Relief", - "block.mineralogy.gneiss_relief_blank": "Gneis Leere Erleichterung", - "block.mineralogy.gneiss_relief_cross": "Gneis Cross Relief", - "block.mineralogy.gneiss_relief_hammer": "Gneis Hammer Relief", - "block.mineralogy.gneiss_relief_hoe": "Gneis Hacke Erleichterung", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Horizontales Relief", - "block.mineralogy.gneiss_relief_i": "Gneis I Relief", - "block.mineralogy.gneiss_relief_left": "Gneis Relief links", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Spitzhacke Relief", - "block.mineralogy.gneiss_relief_plus": "Gneis Plus Relief", - "block.mineralogy.gneiss_relief_right": "Gneis Rechte Erleichterung", - "block.mineralogy.gneiss_relief_sword": "Gneis Schwert Relief", - "block.mineralogy.gneiss_relief_vertical": "Gneis Vertikales Relief", - "block.mineralogy.phyllite_relief_axe": "Phyllite Axe Relief", - "block.mineralogy.phyllite_relief_blank": "Phyllite Leere Erleichterung", - "block.mineralogy.phyllite_relief_cross": "Phyllite Cross Relief", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Hammer Relief", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hacke Erleichterung", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Horizontales Relief", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief links", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Spitzhacke Relief", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus Relief", - "block.mineralogy.phyllite_relief_right": "Phyllite Rechte Erleichterung", - "block.mineralogy.phyllite_relief_sword": "Phyllite Schwert Relief", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Vertikales Relief", - "block.mineralogy.amphibolite_relief_axe": "Amphibolith Axe Relief", - "block.mineralogy.amphibolite_relief_blank": "Amphibolith Leere Erleichterung", - "block.mineralogy.amphibolite_relief_cross": "Amphibolith Cross Relief", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolith Hammer Relief", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolith Hacke Erleichterung", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolith Horizontales Relief", - "block.mineralogy.amphibolite_relief_i": "Amphibolith I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolith Relief links", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolith Spitzhacke Relief", - "block.mineralogy.amphibolite_relief_plus": "Amphibolith Plus Relief", - "block.mineralogy.amphibolite_relief_right": "Amphibolith Rechte Erleichterung", - "block.mineralogy.amphibolite_relief_sword": "Amphibolith Schwert Relief", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolith Vertikales Relief", - "block.mineralogy.diabase_relief_axe": "Diabas Axe Relief", - "block.mineralogy.diabase_relief_blank": "Diabas Leere Erleichterung", - "block.mineralogy.diabase_relief_cross": "Diabas Cross Relief", - "block.mineralogy.diabase_relief_hammer": "Diabas Hammer Relief", - "block.mineralogy.diabase_relief_hoe": "Diabas Hacke Erleichterung", - "block.mineralogy.diabase_relief_horizontal": "Diabas Horizontales Relief", - "block.mineralogy.diabase_relief_i": "Diabas I Relief", - "block.mineralogy.diabase_relief_left": "Diabas Relief links", - "block.mineralogy.diabase_relief_pickaxe": "Diabas Spitzhacke Relief", - "block.mineralogy.diabase_relief_plus": "Diabas Plus Relief", - "block.mineralogy.diabase_relief_right": "Diabas Rechte Erleichterung", - "block.mineralogy.diabase_relief_sword": "Diabas Schwert Relief", - "block.mineralogy.diabase_relief_vertical": "Diabas Vertikales Relief", - "block.mineralogy.gabbro_relief_axe": "Gabbro Axe Relief", - "block.mineralogy.gabbro_relief_blank": "Gabbro Leere Erleichterung", - "block.mineralogy.gabbro_relief_cross": "Gabbro Cross Relief", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Hammer Relief", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hacke Erleichterung", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Horizontales Relief", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief links", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Spitzhacke Relief", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus Relief", - "block.mineralogy.gabbro_relief_right": "Gabbro Rechte Erleichterung", - "block.mineralogy.gabbro_relief_sword": "Gabbro Schwert Relief", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Vertikales Relief", - "block.mineralogy.peridotite_relief_axe": "Peridotit Axe Relief", - "block.mineralogy.peridotite_relief_blank": "Peridotit Leere Erleichterung", - "block.mineralogy.peridotite_relief_cross": "Peridotit Cross Relief", - "block.mineralogy.peridotite_relief_hammer": "Peridotit Hammer Relief", - "block.mineralogy.peridotite_relief_hoe": "Peridotit Hacke Erleichterung", - "block.mineralogy.peridotite_relief_horizontal": "Peridotit Horizontales Relief", - "block.mineralogy.peridotite_relief_i": "Peridotit I Relief", - "block.mineralogy.peridotite_relief_left": "Peridotit Relief links", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotit Spitzhacke Relief", - "block.mineralogy.peridotite_relief_plus": "Peridotit Plus Relief", - "block.mineralogy.peridotite_relief_right": "Peridotit Rechte Erleichterung", - "block.mineralogy.peridotite_relief_sword": "Peridotit Schwert Relief", - "block.mineralogy.peridotite_relief_vertical": "Peridotit Vertikales Relief", - "block.mineralogy.basaltic_glass_relief_axe": "Basaltglas Axe Relief", - "block.mineralogy.basaltic_glass_relief_blank": "Basaltglas Leere Erleichterung", - "block.mineralogy.basaltic_glass_relief_cross": "Basaltglas Cross Relief", - "block.mineralogy.basaltic_glass_relief_hammer": "Basaltglas Hammer Relief", - "block.mineralogy.basaltic_glass_relief_hoe": "Basaltglas Hacke Erleichterung", - "block.mineralogy.basaltic_glass_relief_horizontal": "Basaltglas Horizontales Relief", - "block.mineralogy.basaltic_glass_relief_i": "Basaltglas I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Basaltglas Relief links", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Basaltglas Spitzhacke Relief", - "block.mineralogy.basaltic_glass_relief_plus": "Basaltglas Plus Relief", - "block.mineralogy.basaltic_glass_relief_right": "Basaltglas Rechte Erleichterung", - "block.mineralogy.basaltic_glass_relief_sword": "Basaltglas Schwert Relief", - "block.mineralogy.basaltic_glass_relief_vertical": "Basaltglas Vertikales Relief", - "block.mineralogy.scoria_relief_axe": "Schlacke Axe Relief", - "block.mineralogy.scoria_relief_blank": "Schlacke Leere Erleichterung", - "block.mineralogy.scoria_relief_cross": "Schlacke Cross Relief", - "block.mineralogy.scoria_relief_hammer": "Schlacke Hammer Relief", - "block.mineralogy.scoria_relief_hoe": "Schlacke Hacke Erleichterung", - "block.mineralogy.scoria_relief_horizontal": "Schlacke Horizontales Relief", - "block.mineralogy.scoria_relief_i": "Schlacke I Relief", - "block.mineralogy.scoria_relief_left": "Schlacke Relief links", - "block.mineralogy.scoria_relief_pickaxe": "Schlacke Spitzhacke Relief", - "block.mineralogy.scoria_relief_plus": "Schlacke Plus Relief", - "block.mineralogy.scoria_relief_right": "Schlacke Rechte Erleichterung", - "block.mineralogy.scoria_relief_sword": "Schlacke Schwert Relief", - "block.mineralogy.scoria_relief_vertical": "Schlacke Vertikales Relief", - "block.mineralogy.tuff_relief_axe": "Tuff Axe Relief", - "block.mineralogy.tuff_relief_blank": "Tuff Leere Erleichterung", - "block.mineralogy.tuff_relief_cross": "Tuff Cross Relief", - "block.mineralogy.tuff_relief_hammer": "Tuff Hammer Relief", - "block.mineralogy.tuff_relief_hoe": "Tuff Hacke Erleichterung", - "block.mineralogy.tuff_relief_horizontal": "Tuff Horizontales Relief", - "block.mineralogy.tuff_relief_i": "Tuff I Relief", - "block.mineralogy.tuff_relief_left": "Tuff Relief links", - "block.mineralogy.tuff_relief_pickaxe": "Tuff Spitzhacke Relief", - "block.mineralogy.tuff_relief_plus": "Tuff Plus Relief", - "block.mineralogy.tuff_relief_right": "Tuff Rechte Erleichterung", - "block.mineralogy.tuff_relief_sword": "Tuff Schwert Relief", - "block.mineralogy.tuff_relief_vertical": "Tuff Vertikales Relief", - "block.mineralogy.siltstone_relief_axe": "Schluffstein Axe Relief", - "block.mineralogy.siltstone_relief_blank": "Schluffstein Leere Erleichterung", - "block.mineralogy.siltstone_relief_cross": "Schluffstein Cross Relief", - "block.mineralogy.siltstone_relief_hammer": "Schluffstein Hammer Relief", - "block.mineralogy.siltstone_relief_hoe": "Schluffstein Hacke Erleichterung", - "block.mineralogy.siltstone_relief_horizontal": "Schluffstein Horizontales Relief", - "block.mineralogy.siltstone_relief_i": "Schluffstein I Relief", - "block.mineralogy.siltstone_relief_left": "Schluffstein Relief links", - "block.mineralogy.siltstone_relief_pickaxe": "Schluffstein Spitzhacke Relief", - "block.mineralogy.siltstone_relief_plus": "Schluffstein Plus Relief", - "block.mineralogy.siltstone_relief_right": "Schluffstein Rechte Erleichterung", - "block.mineralogy.siltstone_relief_sword": "Schluffstein Schwert Relief", - "block.mineralogy.siltstone_relief_vertical": "Schluffstein Vertikales Relief", - "block.mineralogy.rock_salt_relief_axe": "Steinsalz Axe Relief", - "block.mineralogy.rock_salt_relief_blank": "Steinsalz Leere Erleichterung", - "block.mineralogy.rock_salt_relief_cross": "Steinsalz Cross Relief", - "block.mineralogy.rock_salt_relief_hammer": "Steinsalz Hammer Relief", - "block.mineralogy.rock_salt_relief_hoe": "Steinsalz Hacke Erleichterung", - "block.mineralogy.rock_salt_relief_horizontal": "Steinsalz Horizontales Relief", - "block.mineralogy.rock_salt_relief_i": "Steinsalz I Relief", - "block.mineralogy.rock_salt_relief_left": "Steinsalz Relief links", - "block.mineralogy.rock_salt_relief_pickaxe": "Steinsalz Spitzhacke Relief", - "block.mineralogy.rock_salt_relief_plus": "Steinsalz Plus Relief", - "block.mineralogy.rock_salt_relief_right": "Steinsalz Rechte Erleichterung", - "block.mineralogy.rock_salt_relief_sword": "Steinsalz Schwert Relief", - "block.mineralogy.rock_salt_relief_vertical": "Steinsalz Vertikales Relief", - "block.mineralogy.hornfels_relief_axe": "Hornfels Axe Relief", - "block.mineralogy.hornfels_relief_blank": "Hornfels Leere Erleichterung", - "block.mineralogy.hornfels_relief_cross": "Hornfels Cross Relief", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Hammer Relief", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hacke Erleichterung", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Horizontales Relief", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief links", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Spitzhacke Relief", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus Relief", - "block.mineralogy.hornfels_relief_right": "Hornfels Rechte Erleichterung", - "block.mineralogy.hornfels_relief_sword": "Hornfels Schwert Relief", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Vertikales Relief", - "block.mineralogy.quartzite_relief_axe": "Quarzit Axe Relief", - "block.mineralogy.quartzite_relief_blank": "Quarzit Leere Erleichterung", - "block.mineralogy.quartzite_relief_cross": "Quarzit Cross Relief", - "block.mineralogy.quartzite_relief_hammer": "Quarzit Hammer Relief", - "block.mineralogy.quartzite_relief_hoe": "Quarzit Hacke Erleichterung", - "block.mineralogy.quartzite_relief_horizontal": "Quarzit Horizontales Relief", - "block.mineralogy.quartzite_relief_i": "Quarzit I Relief", - "block.mineralogy.quartzite_relief_left": "Quarzit Relief links", - "block.mineralogy.quartzite_relief_pickaxe": "Quarzit Spitzhacke Relief", - "block.mineralogy.quartzite_relief_plus": "Quarzit Plus Relief", - "block.mineralogy.quartzite_relief_right": "Quarzit Rechte Erleichterung", - "block.mineralogy.quartzite_relief_sword": "Quarzit Schwert Relief", - "block.mineralogy.quartzite_relief_vertical": "Quarzit Vertikales Relief", - "block.mineralogy.novaculite_relief_axe": "Novaculite Axe Relief", - "block.mineralogy.novaculite_relief_blank": "Novaculite Leere Erleichterung", - "block.mineralogy.novaculite_relief_cross": "Novaculite Cross Relief", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Hammer Relief", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hacke Erleichterung", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Horizontales Relief", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief links", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Spitzhacke Relief", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus Relief", - "block.mineralogy.novaculite_relief_right": "Novaculite Rechte Erleichterung", - "block.mineralogy.novaculite_relief_sword": "Novaculite Schwert Relief", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertikales Relief", - "advancements.mineralogy.all_the_rocks.title": "Nennen Sie die Felsen Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, Sie haben alle gängigen Gesteinsarten in der Mineralogie gefunden!", - "fluid.mineralogy.crude_oil": "Rohöl", - "block.mineralogy.crude_oil": "Rohöl", - "item.mineralogy.crude_oil_bucket": "Rohöleimer", + "block.mineralogy.andesite_relief_axe": "Relief aus Andesit (Axt)", + "block.mineralogy.andesite_relief_blank": "Relief aus Andesit (ohne Motiv)", + "block.mineralogy.andesite_relief_cross": "Relief aus Andesit (Kreuz)", + "block.mineralogy.andesite_relief_hammer": "Relief aus Andesit (Hammer)", + "block.mineralogy.andesite_relief_hoe": "Relief aus Andesit (Hacke)", + "block.mineralogy.andesite_relief_horizontal": "Relief aus Andesit (waagerecht)", + "block.mineralogy.andesite_relief_i": "Relief aus Andesit (I)", + "block.mineralogy.andesite_relief_left": "Relief aus Andesit (links)", + "block.mineralogy.andesite_relief_pickaxe": "Relief aus Andesit (Spitzhacke)", + "block.mineralogy.andesite_relief_plus": "Relief aus Andesit (Pluszeichen)", + "block.mineralogy.andesite_relief_right": "Relief aus Andesit (rechts)", + "block.mineralogy.andesite_relief_sword": "Relief aus Andesit (Schwert)", + "block.mineralogy.andesite_relief_vertical": "Relief aus Andesit (senkrecht)", + "block.mineralogy.basalt_relief_axe": "Relief aus Basalt (Axt)", + "block.mineralogy.basalt_relief_blank": "Relief aus Basalt (ohne Motiv)", + "block.mineralogy.basalt_relief_cross": "Relief aus Basalt (Kreuz)", + "block.mineralogy.basalt_relief_hammer": "Relief aus Basalt (Hammer)", + "block.mineralogy.basalt_relief_hoe": "Relief aus Basalt (Hacke)", + "block.mineralogy.basalt_relief_horizontal": "Relief aus Basalt (waagerecht)", + "block.mineralogy.basalt_relief_i": "Relief aus Basalt (I)", + "block.mineralogy.basalt_relief_left": "Relief aus Basalt (links)", + "block.mineralogy.basalt_relief_pickaxe": "Relief aus Basalt (Spitzhacke)", + "block.mineralogy.basalt_relief_plus": "Relief aus Basalt (Pluszeichen)", + "block.mineralogy.basalt_relief_right": "Relief aus Basalt (rechts)", + "block.mineralogy.basalt_relief_sword": "Relief aus Basalt (Schwert)", + "block.mineralogy.basalt_relief_vertical": "Relief aus Basalt (senkrecht)", + "block.mineralogy.diorite_relief_axe": "Relief aus Diorit (Axt)", + "block.mineralogy.diorite_relief_blank": "Relief aus Diorit (ohne Motiv)", + "block.mineralogy.diorite_relief_cross": "Relief aus Diorit (Kreuz)", + "block.mineralogy.diorite_relief_hammer": "Relief aus Diorit (Hammer)", + "block.mineralogy.diorite_relief_hoe": "Relief aus Diorit (Hacke)", + "block.mineralogy.diorite_relief_horizontal": "Relief aus Diorit (waagerecht)", + "block.mineralogy.diorite_relief_i": "Relief aus Diorit (I)", + "block.mineralogy.diorite_relief_left": "Relief aus Diorit (links)", + "block.mineralogy.diorite_relief_pickaxe": "Relief aus Diorit (Spitzhacke)", + "block.mineralogy.diorite_relief_plus": "Relief aus Diorit (Pluszeichen)", + "block.mineralogy.diorite_relief_right": "Relief aus Diorit (rechts)", + "block.mineralogy.diorite_relief_sword": "Relief aus Diorit (Schwert)", + "block.mineralogy.diorite_relief_vertical": "Relief aus Diorit (senkrecht)", + "block.mineralogy.granite_relief_axe": "Relief aus Granit (Axt)", + "block.mineralogy.granite_relief_blank": "Relief aus Granit (ohne Motiv)", + "block.mineralogy.granite_relief_cross": "Relief aus Granit (Kreuz)", + "block.mineralogy.granite_relief_hammer": "Relief aus Granit (Hammer)", + "block.mineralogy.granite_relief_hoe": "Relief aus Granit (Hacke)", + "block.mineralogy.granite_relief_horizontal": "Relief aus Granit (waagerecht)", + "block.mineralogy.granite_relief_i": "Relief aus Granit (I)", + "block.mineralogy.granite_relief_left": "Relief aus Granit (links)", + "block.mineralogy.granite_relief_pickaxe": "Relief aus Granit (Spitzhacke)", + "block.mineralogy.granite_relief_plus": "Relief aus Granit (Pluszeichen)", + "block.mineralogy.granite_relief_right": "Relief aus Granit (rechts)", + "block.mineralogy.granite_relief_sword": "Relief aus Granit (Schwert)", + "block.mineralogy.granite_relief_vertical": "Relief aus Granit (senkrecht)", + "block.mineralogy.rhyolite_relief_axe": "Relief aus Rhyolith (Axt)", + "block.mineralogy.rhyolite_relief_blank": "Relief aus Rhyolith (ohne Motiv)", + "block.mineralogy.rhyolite_relief_cross": "Relief aus Rhyolith (Kreuz)", + "block.mineralogy.rhyolite_relief_hammer": "Relief aus Rhyolith (Hammer)", + "block.mineralogy.rhyolite_relief_hoe": "Relief aus Rhyolith (Hacke)", + "block.mineralogy.rhyolite_relief_horizontal": "Relief aus Rhyolith (waagerecht)", + "block.mineralogy.rhyolite_relief_i": "Relief aus Rhyolith (I)", + "block.mineralogy.rhyolite_relief_left": "Relief aus Rhyolith (links)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relief aus Rhyolith (Spitzhacke)", + "block.mineralogy.rhyolite_relief_plus": "Relief aus Rhyolith (Pluszeichen)", + "block.mineralogy.rhyolite_relief_right": "Relief aus Rhyolith (rechts)", + "block.mineralogy.rhyolite_relief_sword": "Relief aus Rhyolith (Schwert)", + "block.mineralogy.rhyolite_relief_vertical": "Relief aus Rhyolith (senkrecht)", + "block.mineralogy.pegmatite_relief_axe": "Relief aus Pegmatit (Axt)", + "block.mineralogy.pegmatite_relief_blank": "Relief aus Pegmatit (ohne Motiv)", + "block.mineralogy.pegmatite_relief_cross": "Relief aus Pegmatit (Kreuz)", + "block.mineralogy.pegmatite_relief_hammer": "Relief aus Pegmatit (Hammer)", + "block.mineralogy.pegmatite_relief_hoe": "Relief aus Pegmatit (Hacke)", + "block.mineralogy.pegmatite_relief_horizontal": "Relief aus Pegmatit (waagerecht)", + "block.mineralogy.pegmatite_relief_i": "Relief aus Pegmatit (I)", + "block.mineralogy.pegmatite_relief_left": "Relief aus Pegmatit (links)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relief aus Pegmatit (Spitzhacke)", + "block.mineralogy.pegmatite_relief_plus": "Relief aus Pegmatit (Pluszeichen)", + "block.mineralogy.pegmatite_relief_right": "Relief aus Pegmatit (rechts)", + "block.mineralogy.pegmatite_relief_sword": "Relief aus Pegmatit (Schwert)", + "block.mineralogy.pegmatite_relief_vertical": "Relief aus Pegmatit (senkrecht)", + "block.mineralogy.shale_relief_axe": "Relief aus Tonschiefer (Axt)", + "block.mineralogy.shale_relief_blank": "Relief aus Tonschiefer (ohne Motiv)", + "block.mineralogy.shale_relief_cross": "Relief aus Tonschiefer (Kreuz)", + "block.mineralogy.shale_relief_hammer": "Relief aus Tonschiefer (Hammer)", + "block.mineralogy.shale_relief_hoe": "Relief aus Tonschiefer (Hacke)", + "block.mineralogy.shale_relief_horizontal": "Relief aus Tonschiefer (waagerecht)", + "block.mineralogy.shale_relief_i": "Relief aus Tonschiefer (I)", + "block.mineralogy.shale_relief_left": "Relief aus Tonschiefer (links)", + "block.mineralogy.shale_relief_pickaxe": "Relief aus Tonschiefer (Spitzhacke)", + "block.mineralogy.shale_relief_plus": "Relief aus Tonschiefer (Pluszeichen)", + "block.mineralogy.shale_relief_right": "Relief aus Tonschiefer (rechts)", + "block.mineralogy.shale_relief_sword": "Relief aus Tonschiefer (Schwert)", + "block.mineralogy.shale_relief_vertical": "Relief aus Tonschiefer (senkrecht)", + "block.mineralogy.conglomerate_relief_axe": "Relief aus Konglomerat (Axt)", + "block.mineralogy.conglomerate_relief_blank": "Relief aus Konglomerat (ohne Motiv)", + "block.mineralogy.conglomerate_relief_cross": "Relief aus Konglomerat (Kreuz)", + "block.mineralogy.conglomerate_relief_hammer": "Relief aus Konglomerat (Hammer)", + "block.mineralogy.conglomerate_relief_hoe": "Relief aus Konglomerat (Hacke)", + "block.mineralogy.conglomerate_relief_horizontal": "Relief aus Konglomerat (waagerecht)", + "block.mineralogy.conglomerate_relief_i": "Relief aus Konglomerat (I)", + "block.mineralogy.conglomerate_relief_left": "Relief aus Konglomerat (links)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relief aus Konglomerat (Spitzhacke)", + "block.mineralogy.conglomerate_relief_plus": "Relief aus Konglomerat (Pluszeichen)", + "block.mineralogy.conglomerate_relief_right": "Relief aus Konglomerat (rechts)", + "block.mineralogy.conglomerate_relief_sword": "Relief aus Konglomerat (Schwert)", + "block.mineralogy.conglomerate_relief_vertical": "Relief aus Konglomerat (senkrecht)", + "block.mineralogy.dolomite_relief_axe": "Relief aus Dolomit (Axt)", + "block.mineralogy.dolomite_relief_blank": "Relief aus Dolomit (ohne Motiv)", + "block.mineralogy.dolomite_relief_cross": "Relief aus Dolomit (Kreuz)", + "block.mineralogy.dolomite_relief_hammer": "Relief aus Dolomit (Hammer)", + "block.mineralogy.dolomite_relief_hoe": "Relief aus Dolomit (Hacke)", + "block.mineralogy.dolomite_relief_horizontal": "Relief aus Dolomit (waagerecht)", + "block.mineralogy.dolomite_relief_i": "Relief aus Dolomit (I)", + "block.mineralogy.dolomite_relief_left": "Relief aus Dolomit (links)", + "block.mineralogy.dolomite_relief_pickaxe": "Relief aus Dolomit (Spitzhacke)", + "block.mineralogy.dolomite_relief_plus": "Relief aus Dolomit (Pluszeichen)", + "block.mineralogy.dolomite_relief_right": "Relief aus Dolomit (rechts)", + "block.mineralogy.dolomite_relief_sword": "Relief aus Dolomit (Schwert)", + "block.mineralogy.dolomite_relief_vertical": "Relief aus Dolomit (senkrecht)", + "block.mineralogy.limestone_relief_axe": "Relief aus Kalkstein (Axt)", + "block.mineralogy.limestone_relief_blank": "Relief aus Kalkstein (ohne Motiv)", + "block.mineralogy.limestone_relief_cross": "Relief aus Kalkstein (Kreuz)", + "block.mineralogy.limestone_relief_hammer": "Relief aus Kalkstein (Hammer)", + "block.mineralogy.limestone_relief_hoe": "Relief aus Kalkstein (Hacke)", + "block.mineralogy.limestone_relief_horizontal": "Relief aus Kalkstein (waagerecht)", + "block.mineralogy.limestone_relief_i": "Relief aus Kalkstein (I)", + "block.mineralogy.limestone_relief_left": "Relief aus Kalkstein (links)", + "block.mineralogy.limestone_relief_pickaxe": "Relief aus Kalkstein (Spitzhacke)", + "block.mineralogy.limestone_relief_plus": "Relief aus Kalkstein (Pluszeichen)", + "block.mineralogy.limestone_relief_right": "Relief aus Kalkstein (rechts)", + "block.mineralogy.limestone_relief_sword": "Relief aus Kalkstein (Schwert)", + "block.mineralogy.limestone_relief_vertical": "Relief aus Kalkstein (senkrecht)", + "block.mineralogy.marble_relief_axe": "Relief aus Marmor (Axt)", + "block.mineralogy.marble_relief_blank": "Relief aus Marmor (ohne Motiv)", + "block.mineralogy.marble_relief_cross": "Relief aus Marmor (Kreuz)", + "block.mineralogy.marble_relief_hammer": "Relief aus Marmor (Hammer)", + "block.mineralogy.marble_relief_hoe": "Relief aus Marmor (Hacke)", + "block.mineralogy.marble_relief_horizontal": "Relief aus Marmor (waagerecht)", + "block.mineralogy.marble_relief_i": "Relief aus Marmor (I)", + "block.mineralogy.marble_relief_left": "Relief aus Marmor (links)", + "block.mineralogy.marble_relief_pickaxe": "Relief aus Marmor (Spitzhacke)", + "block.mineralogy.marble_relief_plus": "Relief aus Marmor (Pluszeichen)", + "block.mineralogy.marble_relief_right": "Relief aus Marmor (rechts)", + "block.mineralogy.marble_relief_sword": "Relief aus Marmor (Schwert)", + "block.mineralogy.marble_relief_vertical": "Relief aus Marmor (senkrecht)", + "block.mineralogy.slate_relief_axe": "Relief aus Schiefer (Axt)", + "block.mineralogy.slate_relief_blank": "Relief aus Schiefer (ohne Motiv)", + "block.mineralogy.slate_relief_cross": "Relief aus Schiefer (Kreuz)", + "block.mineralogy.slate_relief_hammer": "Relief aus Schiefer (Hammer)", + "block.mineralogy.slate_relief_hoe": "Relief aus Schiefer (Hacke)", + "block.mineralogy.slate_relief_horizontal": "Relief aus Schiefer (waagerecht)", + "block.mineralogy.slate_relief_i": "Relief aus Schiefer (I)", + "block.mineralogy.slate_relief_left": "Relief aus Schiefer (links)", + "block.mineralogy.slate_relief_pickaxe": "Relief aus Schiefer (Spitzhacke)", + "block.mineralogy.slate_relief_plus": "Relief aus Schiefer (Pluszeichen)", + "block.mineralogy.slate_relief_right": "Relief aus Schiefer (rechts)", + "block.mineralogy.slate_relief_sword": "Relief aus Schiefer (Schwert)", + "block.mineralogy.slate_relief_vertical": "Relief aus Schiefer (senkrecht)", + "block.mineralogy.schist_relief_axe": "Relief aus Glimmerschiefer (Axt)", + "block.mineralogy.schist_relief_blank": "Relief aus Glimmerschiefer (ohne Motiv)", + "block.mineralogy.schist_relief_cross": "Relief aus Glimmerschiefer (Kreuz)", + "block.mineralogy.schist_relief_hammer": "Relief aus Glimmerschiefer (Hammer)", + "block.mineralogy.schist_relief_hoe": "Relief aus Glimmerschiefer (Hacke)", + "block.mineralogy.schist_relief_horizontal": "Relief aus Glimmerschiefer (waagerecht)", + "block.mineralogy.schist_relief_i": "Relief aus Glimmerschiefer (I)", + "block.mineralogy.schist_relief_left": "Relief aus Glimmerschiefer (links)", + "block.mineralogy.schist_relief_pickaxe": "Relief aus Glimmerschiefer (Spitzhacke)", + "block.mineralogy.schist_relief_plus": "Relief aus Glimmerschiefer (Pluszeichen)", + "block.mineralogy.schist_relief_right": "Relief aus Glimmerschiefer (rechts)", + "block.mineralogy.schist_relief_sword": "Relief aus Glimmerschiefer (Schwert)", + "block.mineralogy.schist_relief_vertical": "Relief aus Glimmerschiefer (senkrecht)", + "block.mineralogy.gneiss_relief_axe": "Relief aus Gneis (Axt)", + "block.mineralogy.gneiss_relief_blank": "Relief aus Gneis (ohne Motiv)", + "block.mineralogy.gneiss_relief_cross": "Relief aus Gneis (Kreuz)", + "block.mineralogy.gneiss_relief_hammer": "Relief aus Gneis (Hammer)", + "block.mineralogy.gneiss_relief_hoe": "Relief aus Gneis (Hacke)", + "block.mineralogy.gneiss_relief_horizontal": "Relief aus Gneis (waagerecht)", + "block.mineralogy.gneiss_relief_i": "Relief aus Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relief aus Gneis (links)", + "block.mineralogy.gneiss_relief_pickaxe": "Relief aus Gneis (Spitzhacke)", + "block.mineralogy.gneiss_relief_plus": "Relief aus Gneis (Pluszeichen)", + "block.mineralogy.gneiss_relief_right": "Relief aus Gneis (rechts)", + "block.mineralogy.gneiss_relief_sword": "Relief aus Gneis (Schwert)", + "block.mineralogy.gneiss_relief_vertical": "Relief aus Gneis (senkrecht)", + "block.mineralogy.phyllite_relief_axe": "Relief aus Phyllit (Axt)", + "block.mineralogy.phyllite_relief_blank": "Relief aus Phyllit (ohne Motiv)", + "block.mineralogy.phyllite_relief_cross": "Relief aus Phyllit (Kreuz)", + "block.mineralogy.phyllite_relief_hammer": "Relief aus Phyllit (Hammer)", + "block.mineralogy.phyllite_relief_hoe": "Relief aus Phyllit (Hacke)", + "block.mineralogy.phyllite_relief_horizontal": "Relief aus Phyllit (waagerecht)", + "block.mineralogy.phyllite_relief_i": "Relief aus Phyllit (I)", + "block.mineralogy.phyllite_relief_left": "Relief aus Phyllit (links)", + "block.mineralogy.phyllite_relief_pickaxe": "Relief aus Phyllit (Spitzhacke)", + "block.mineralogy.phyllite_relief_plus": "Relief aus Phyllit (Pluszeichen)", + "block.mineralogy.phyllite_relief_right": "Relief aus Phyllit (rechts)", + "block.mineralogy.phyllite_relief_sword": "Relief aus Phyllit (Schwert)", + "block.mineralogy.phyllite_relief_vertical": "Relief aus Phyllit (senkrecht)", + "block.mineralogy.amphibolite_relief_axe": "Relief aus Amphibolit (Axt)", + "block.mineralogy.amphibolite_relief_blank": "Relief aus Amphibolit (ohne Motiv)", + "block.mineralogy.amphibolite_relief_cross": "Relief aus Amphibolit (Kreuz)", + "block.mineralogy.amphibolite_relief_hammer": "Relief aus Amphibolit (Hammer)", + "block.mineralogy.amphibolite_relief_hoe": "Relief aus Amphibolit (Hacke)", + "block.mineralogy.amphibolite_relief_horizontal": "Relief aus Amphibolit (waagerecht)", + "block.mineralogy.amphibolite_relief_i": "Relief aus Amphibolit (I)", + "block.mineralogy.amphibolite_relief_left": "Relief aus Amphibolit (links)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relief aus Amphibolit (Spitzhacke)", + "block.mineralogy.amphibolite_relief_plus": "Relief aus Amphibolit (Pluszeichen)", + "block.mineralogy.amphibolite_relief_right": "Relief aus Amphibolit (rechts)", + "block.mineralogy.amphibolite_relief_sword": "Relief aus Amphibolit (Schwert)", + "block.mineralogy.amphibolite_relief_vertical": "Relief aus Amphibolit (senkrecht)", + "block.mineralogy.diabase_relief_axe": "Relief aus Diabas (Axt)", + "block.mineralogy.diabase_relief_blank": "Relief aus Diabas (ohne Motiv)", + "block.mineralogy.diabase_relief_cross": "Relief aus Diabas (Kreuz)", + "block.mineralogy.diabase_relief_hammer": "Relief aus Diabas (Hammer)", + "block.mineralogy.diabase_relief_hoe": "Relief aus Diabas (Hacke)", + "block.mineralogy.diabase_relief_horizontal": "Relief aus Diabas (waagerecht)", + "block.mineralogy.diabase_relief_i": "Relief aus Diabas (I)", + "block.mineralogy.diabase_relief_left": "Relief aus Diabas (links)", + "block.mineralogy.diabase_relief_pickaxe": "Relief aus Diabas (Spitzhacke)", + "block.mineralogy.diabase_relief_plus": "Relief aus Diabas (Pluszeichen)", + "block.mineralogy.diabase_relief_right": "Relief aus Diabas (rechts)", + "block.mineralogy.diabase_relief_sword": "Relief aus Diabas (Schwert)", + "block.mineralogy.diabase_relief_vertical": "Relief aus Diabas (senkrecht)", + "block.mineralogy.gabbro_relief_axe": "Relief aus Gabbro (Axt)", + "block.mineralogy.gabbro_relief_blank": "Relief aus Gabbro (ohne Motiv)", + "block.mineralogy.gabbro_relief_cross": "Relief aus Gabbro (Kreuz)", + "block.mineralogy.gabbro_relief_hammer": "Relief aus Gabbro (Hammer)", + "block.mineralogy.gabbro_relief_hoe": "Relief aus Gabbro (Hacke)", + "block.mineralogy.gabbro_relief_horizontal": "Relief aus Gabbro (waagerecht)", + "block.mineralogy.gabbro_relief_i": "Relief aus Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Relief aus Gabbro (links)", + "block.mineralogy.gabbro_relief_pickaxe": "Relief aus Gabbro (Spitzhacke)", + "block.mineralogy.gabbro_relief_plus": "Relief aus Gabbro (Pluszeichen)", + "block.mineralogy.gabbro_relief_right": "Relief aus Gabbro (rechts)", + "block.mineralogy.gabbro_relief_sword": "Relief aus Gabbro (Schwert)", + "block.mineralogy.gabbro_relief_vertical": "Relief aus Gabbro (senkrecht)", + "block.mineralogy.peridotite_relief_axe": "Relief aus Peridotit (Axt)", + "block.mineralogy.peridotite_relief_blank": "Relief aus Peridotit (ohne Motiv)", + "block.mineralogy.peridotite_relief_cross": "Relief aus Peridotit (Kreuz)", + "block.mineralogy.peridotite_relief_hammer": "Relief aus Peridotit (Hammer)", + "block.mineralogy.peridotite_relief_hoe": "Relief aus Peridotit (Hacke)", + "block.mineralogy.peridotite_relief_horizontal": "Relief aus Peridotit (waagerecht)", + "block.mineralogy.peridotite_relief_i": "Relief aus Peridotit (I)", + "block.mineralogy.peridotite_relief_left": "Relief aus Peridotit (links)", + "block.mineralogy.peridotite_relief_pickaxe": "Relief aus Peridotit (Spitzhacke)", + "block.mineralogy.peridotite_relief_plus": "Relief aus Peridotit (Pluszeichen)", + "block.mineralogy.peridotite_relief_right": "Relief aus Peridotit (rechts)", + "block.mineralogy.peridotite_relief_sword": "Relief aus Peridotit (Schwert)", + "block.mineralogy.peridotite_relief_vertical": "Relief aus Peridotit (senkrecht)", + "block.mineralogy.basaltic_glass_relief_axe": "Relief aus Basaltglas (Axt)", + "block.mineralogy.basaltic_glass_relief_blank": "Relief aus Basaltglas (ohne Motiv)", + "block.mineralogy.basaltic_glass_relief_cross": "Relief aus Basaltglas (Kreuz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relief aus Basaltglas (Hammer)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relief aus Basaltglas (Hacke)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relief aus Basaltglas (waagerecht)", + "block.mineralogy.basaltic_glass_relief_i": "Relief aus Basaltglas (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relief aus Basaltglas (links)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relief aus Basaltglas (Spitzhacke)", + "block.mineralogy.basaltic_glass_relief_plus": "Relief aus Basaltglas (Pluszeichen)", + "block.mineralogy.basaltic_glass_relief_right": "Relief aus Basaltglas (rechts)", + "block.mineralogy.basaltic_glass_relief_sword": "Relief aus Basaltglas (Schwert)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relief aus Basaltglas (senkrecht)", + "block.mineralogy.scoria_relief_axe": "Relief aus Skoria (Axt)", + "block.mineralogy.scoria_relief_blank": "Relief aus Skoria (ohne Motiv)", + "block.mineralogy.scoria_relief_cross": "Relief aus Skoria (Kreuz)", + "block.mineralogy.scoria_relief_hammer": "Relief aus Skoria (Hammer)", + "block.mineralogy.scoria_relief_hoe": "Relief aus Skoria (Hacke)", + "block.mineralogy.scoria_relief_horizontal": "Relief aus Skoria (waagerecht)", + "block.mineralogy.scoria_relief_i": "Relief aus Skoria (I)", + "block.mineralogy.scoria_relief_left": "Relief aus Skoria (links)", + "block.mineralogy.scoria_relief_pickaxe": "Relief aus Skoria (Spitzhacke)", + "block.mineralogy.scoria_relief_plus": "Relief aus Skoria (Pluszeichen)", + "block.mineralogy.scoria_relief_right": "Relief aus Skoria (rechts)", + "block.mineralogy.scoria_relief_sword": "Relief aus Skoria (Schwert)", + "block.mineralogy.scoria_relief_vertical": "Relief aus Skoria (senkrecht)", + "block.mineralogy.tuff_relief_axe": "Relief aus Tuffstein (Axt)", + "block.mineralogy.tuff_relief_blank": "Relief aus Tuffstein (ohne Motiv)", + "block.mineralogy.tuff_relief_cross": "Relief aus Tuffstein (Kreuz)", + "block.mineralogy.tuff_relief_hammer": "Relief aus Tuffstein (Hammer)", + "block.mineralogy.tuff_relief_hoe": "Relief aus Tuffstein (Hacke)", + "block.mineralogy.tuff_relief_horizontal": "Relief aus Tuffstein (waagerecht)", + "block.mineralogy.tuff_relief_i": "Relief aus Tuffstein (I)", + "block.mineralogy.tuff_relief_left": "Relief aus Tuffstein (links)", + "block.mineralogy.tuff_relief_pickaxe": "Relief aus Tuffstein (Spitzhacke)", + "block.mineralogy.tuff_relief_plus": "Relief aus Tuffstein (Pluszeichen)", + "block.mineralogy.tuff_relief_right": "Relief aus Tuffstein (rechts)", + "block.mineralogy.tuff_relief_sword": "Relief aus Tuffstein (Schwert)", + "block.mineralogy.tuff_relief_vertical": "Relief aus Tuffstein (senkrecht)", + "block.mineralogy.siltstone_relief_axe": "Relief aus Schluffstein (Axt)", + "block.mineralogy.siltstone_relief_blank": "Relief aus Schluffstein (ohne Motiv)", + "block.mineralogy.siltstone_relief_cross": "Relief aus Schluffstein (Kreuz)", + "block.mineralogy.siltstone_relief_hammer": "Relief aus Schluffstein (Hammer)", + "block.mineralogy.siltstone_relief_hoe": "Relief aus Schluffstein (Hacke)", + "block.mineralogy.siltstone_relief_horizontal": "Relief aus Schluffstein (waagerecht)", + "block.mineralogy.siltstone_relief_i": "Relief aus Schluffstein (I)", + "block.mineralogy.siltstone_relief_left": "Relief aus Schluffstein (links)", + "block.mineralogy.siltstone_relief_pickaxe": "Relief aus Schluffstein (Spitzhacke)", + "block.mineralogy.siltstone_relief_plus": "Relief aus Schluffstein (Pluszeichen)", + "block.mineralogy.siltstone_relief_right": "Relief aus Schluffstein (rechts)", + "block.mineralogy.siltstone_relief_sword": "Relief aus Schluffstein (Schwert)", + "block.mineralogy.siltstone_relief_vertical": "Relief aus Schluffstein (senkrecht)", + "block.mineralogy.rock_salt_relief_axe": "Relief aus Steinsalz (Axt)", + "block.mineralogy.rock_salt_relief_blank": "Relief aus Steinsalz (ohne Motiv)", + "block.mineralogy.rock_salt_relief_cross": "Relief aus Steinsalz (Kreuz)", + "block.mineralogy.rock_salt_relief_hammer": "Relief aus Steinsalz (Hammer)", + "block.mineralogy.rock_salt_relief_hoe": "Relief aus Steinsalz (Hacke)", + "block.mineralogy.rock_salt_relief_horizontal": "Relief aus Steinsalz (waagerecht)", + "block.mineralogy.rock_salt_relief_i": "Relief aus Steinsalz (I)", + "block.mineralogy.rock_salt_relief_left": "Relief aus Steinsalz (links)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relief aus Steinsalz (Spitzhacke)", + "block.mineralogy.rock_salt_relief_plus": "Relief aus Steinsalz (Pluszeichen)", + "block.mineralogy.rock_salt_relief_right": "Relief aus Steinsalz (rechts)", + "block.mineralogy.rock_salt_relief_sword": "Relief aus Steinsalz (Schwert)", + "block.mineralogy.rock_salt_relief_vertical": "Relief aus Steinsalz (senkrecht)", + "block.mineralogy.hornfels_relief_axe": "Relief aus Hornfels (Axt)", + "block.mineralogy.hornfels_relief_blank": "Relief aus Hornfels (ohne Motiv)", + "block.mineralogy.hornfels_relief_cross": "Relief aus Hornfels (Kreuz)", + "block.mineralogy.hornfels_relief_hammer": "Relief aus Hornfels (Hammer)", + "block.mineralogy.hornfels_relief_hoe": "Relief aus Hornfels (Hacke)", + "block.mineralogy.hornfels_relief_horizontal": "Relief aus Hornfels (waagerecht)", + "block.mineralogy.hornfels_relief_i": "Relief aus Hornfels (I)", + "block.mineralogy.hornfels_relief_left": "Relief aus Hornfels (links)", + "block.mineralogy.hornfels_relief_pickaxe": "Relief aus Hornfels (Spitzhacke)", + "block.mineralogy.hornfels_relief_plus": "Relief aus Hornfels (Pluszeichen)", + "block.mineralogy.hornfels_relief_right": "Relief aus Hornfels (rechts)", + "block.mineralogy.hornfels_relief_sword": "Relief aus Hornfels (Schwert)", + "block.mineralogy.hornfels_relief_vertical": "Relief aus Hornfels (senkrecht)", + "block.mineralogy.quartzite_relief_axe": "Relief aus Quarzit (Axt)", + "block.mineralogy.quartzite_relief_blank": "Relief aus Quarzit (ohne Motiv)", + "block.mineralogy.quartzite_relief_cross": "Relief aus Quarzit (Kreuz)", + "block.mineralogy.quartzite_relief_hammer": "Relief aus Quarzit (Hammer)", + "block.mineralogy.quartzite_relief_hoe": "Relief aus Quarzit (Hacke)", + "block.mineralogy.quartzite_relief_horizontal": "Relief aus Quarzit (waagerecht)", + "block.mineralogy.quartzite_relief_i": "Relief aus Quarzit (I)", + "block.mineralogy.quartzite_relief_left": "Relief aus Quarzit (links)", + "block.mineralogy.quartzite_relief_pickaxe": "Relief aus Quarzit (Spitzhacke)", + "block.mineralogy.quartzite_relief_plus": "Relief aus Quarzit (Pluszeichen)", + "block.mineralogy.quartzite_relief_right": "Relief aus Quarzit (rechts)", + "block.mineralogy.quartzite_relief_sword": "Relief aus Quarzit (Schwert)", + "block.mineralogy.quartzite_relief_vertical": "Relief aus Quarzit (senkrecht)", + "block.mineralogy.novaculite_relief_axe": "Relief aus Novakulit (Axt)", + "block.mineralogy.novaculite_relief_blank": "Relief aus Novakulit (ohne Motiv)", + "block.mineralogy.novaculite_relief_cross": "Relief aus Novakulit (Kreuz)", + "block.mineralogy.novaculite_relief_hammer": "Relief aus Novakulit (Hammer)", + "block.mineralogy.novaculite_relief_hoe": "Relief aus Novakulit (Hacke)", + "block.mineralogy.novaculite_relief_horizontal": "Relief aus Novakulit (waagerecht)", + "block.mineralogy.novaculite_relief_i": "Relief aus Novakulit (I)", + "block.mineralogy.novaculite_relief_left": "Relief aus Novakulit (links)", + "block.mineralogy.novaculite_relief_pickaxe": "Relief aus Novakulit (Spitzhacke)", + "block.mineralogy.novaculite_relief_plus": "Relief aus Novakulit (Pluszeichen)", + "block.mineralogy.novaculite_relief_right": "Relief aus Novakulit (rechts)", + "block.mineralogy.novaculite_relief_sword": "Relief aus Novakulit (Schwert)", + "block.mineralogy.novaculite_relief_vertical": "Relief aus Novakulit (senkrecht)", "itemGroup.mineralogy.mineralogy": "Mineralogie", "itemGroup.mineralogy.rock": "Mineralogische Gesteine", - "itemGroup.mineralogy.stair": "Mineralogie-Treppe", - "itemGroup.mineralogy.slab": "Mineralogieplatten", - "itemGroup.mineralogy.wall": "Mineralogie-Wände", - "itemGroup.mineralogy.item": "Mineralogieartikel" + "itemGroup.mineralogy.stair": "Mineralogie-Treppen", + "itemGroup.mineralogy.slab": "Mineralogie-Stufen", + "itemGroup.mineralogy.wall": "Mineralogie-Mauern", + "itemGroup.mineralogy.item": "Mineralogie-Gegenstände", + "block.mineralogy.crude_oil": "Rohöl", + "item.mineralogy.crude_oil_bucket": "Rohöleimer", + "fluid.mineralogy.crude_oil": "Rohöl", + "advancements.mineralogy.all_the_rocks.title": "Alle Gesteine", + "advancements.mineralogy.all_the_rocks.description": "Du hast alle Standardgesteine in Mineralogy gefunden!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_ca.json b/src/main/resources/assets/mineralogy/lang/en_ca.json index 484b10d6c..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_ca.json +++ b/src/main/resources/assets/mineralogy/lang/en_ca.json @@ -926,15 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", - "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "fluid.mineralogy.crude_oil": "Crude Oil", - "block.mineralogy.crude_oil": "Crude Oil", - "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", "itemGroup.mineralogy.mineralogy": "Mineralogy", "itemGroup.mineralogy.rock": "Mineralogy Rocks", "itemGroup.mineralogy.stair": "Mineralogy Stairs", "itemGroup.mineralogy.slab": "Mineralogy Slabs", "itemGroup.mineralogy.wall": "Mineralogy Walls", - "itemGroup.mineralogy.item": "Mineralogy Items" + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", + "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_en.json b/src/main/resources/assets/mineralogy/lang/en_en.json index 484b10d6c..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_en.json +++ b/src/main/resources/assets/mineralogy/lang/en_en.json @@ -926,15 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", - "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "fluid.mineralogy.crude_oil": "Crude Oil", - "block.mineralogy.crude_oil": "Crude Oil", - "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", "itemGroup.mineralogy.mineralogy": "Mineralogy", "itemGroup.mineralogy.rock": "Mineralogy Rocks", "itemGroup.mineralogy.stair": "Mineralogy Stairs", "itemGroup.mineralogy.slab": "Mineralogy Slabs", "itemGroup.mineralogy.wall": "Mineralogy Walls", - "itemGroup.mineralogy.item": "Mineralogy Items" + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", + "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_gb.json b/src/main/resources/assets/mineralogy/lang/en_gb.json index 484b10d6c..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_gb.json +++ b/src/main/resources/assets/mineralogy/lang/en_gb.json @@ -926,15 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", - "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "fluid.mineralogy.crude_oil": "Crude Oil", - "block.mineralogy.crude_oil": "Crude Oil", - "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", "itemGroup.mineralogy.mineralogy": "Mineralogy", "itemGroup.mineralogy.rock": "Mineralogy Rocks", "itemGroup.mineralogy.stair": "Mineralogy Stairs", "itemGroup.mineralogy.slab": "Mineralogy Slabs", "itemGroup.mineralogy.wall": "Mineralogy Walls", - "itemGroup.mineralogy.item": "Mineralogy Items" + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", + "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_pt.json b/src/main/resources/assets/mineralogy/lang/en_pt.json index 484b10d6c..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_pt.json +++ b/src/main/resources/assets/mineralogy/lang/en_pt.json @@ -926,15 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", - "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "fluid.mineralogy.crude_oil": "Crude Oil", - "block.mineralogy.crude_oil": "Crude Oil", - "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", "itemGroup.mineralogy.mineralogy": "Mineralogy", "itemGroup.mineralogy.rock": "Mineralogy Rocks", "itemGroup.mineralogy.stair": "Mineralogy Stairs", "itemGroup.mineralogy.slab": "Mineralogy Slabs", "itemGroup.mineralogy.wall": "Mineralogy Walls", - "itemGroup.mineralogy.item": "Mineralogy Items" + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", + "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_us.json b/src/main/resources/assets/mineralogy/lang/en_us.json index 484b10d6c..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_us.json +++ b/src/main/resources/assets/mineralogy/lang/en_us.json @@ -926,15 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", - "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "fluid.mineralogy.crude_oil": "Crude Oil", - "block.mineralogy.crude_oil": "Crude Oil", - "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", "itemGroup.mineralogy.mineralogy": "Mineralogy", "itemGroup.mineralogy.rock": "Mineralogy Rocks", "itemGroup.mineralogy.stair": "Mineralogy Stairs", "itemGroup.mineralogy.slab": "Mineralogy Slabs", "itemGroup.mineralogy.wall": "Mineralogy Walls", - "itemGroup.mineralogy.item": "Mineralogy Items" + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", + "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/es_es.json b/src/main/resources/assets/mineralogy/lang/es_es.json index 21923e59d..5738497f7 100644 --- a/src/main/resources/assets/mineralogy/lang/es_es.json +++ b/src/main/resources/assets/mineralogy/lang/es_es.json @@ -2,939 +2,939 @@ "block.mineralogy.andesite": "Andesita", "block.mineralogy.andesite_stairs": "Escaleras de Andesita", "block.mineralogy.andesite_slab": "Losa de Andesita", - "block.mineralogy.andesite_brick": "Ladrillo de Andesita", - "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillo Andesita", - "block.mineralogy.andesite_brick_slab": "Losa de ladrillo andesita", - "block.mineralogy.andesite_smooth": "Andesita Pulida", - "block.mineralogy.andesite_smooth_stairs": "Escalera de andesita pulida", + "block.mineralogy.andesite_brick": "Ladrillos de Andesita", + "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillos de Andesita", + "block.mineralogy.andesite_brick_slab": "Losa de ladrillos de Andesita", + "block.mineralogy.andesite_smooth": "Bloque pulido de Andesita", + "block.mineralogy.andesite_smooth_stairs": "Escaleras pulidas de Andesita", "block.mineralogy.andesite_smooth_slab": "Losa pulida de Andesita", - "block.mineralogy.andesite_smooth_brick": "Ladrillo de andesita pulido", - "block.mineralogy.andesite_smooth_brick_stairs": "Escalera de ladrillo anodizado pulido", - "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillo anodizado pulido", + "block.mineralogy.andesite_smooth_brick": "Ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillos pulidos de Andesita", "block.mineralogy.basalt": "Basalto", - "block.mineralogy.basalt_stairs": "Escaleras de basalto", - "block.mineralogy.basalt_slab": "Losa de basalto", - "block.mineralogy.basalt_brick": "Ladrillo de basalto", - "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillo de basalto", - "block.mineralogy.basalt_brick_slab": "Losa de ladrillo de basalto", - "block.mineralogy.basalt_smooth": "Basalto pulido", - "block.mineralogy.basalt_smooth_stairs": "Escaleras de basalto pulido", - "block.mineralogy.basalt_smooth_slab": "Losa de basalto pulida", - "block.mineralogy.basalt_smooth_brick": "Ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillo pulido de basalto", + "block.mineralogy.basalt_stairs": "Escaleras de Basalto", + "block.mineralogy.basalt_slab": "Losa de Basalto", + "block.mineralogy.basalt_brick": "Ladrillos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillos de Basalto", + "block.mineralogy.basalt_brick_slab": "Losa de ladrillos de Basalto", + "block.mineralogy.basalt_smooth": "Bloque pulido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escaleras pulidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Losa pulida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillos pulidos de Basalto", "block.mineralogy.diorite": "Diorita", "block.mineralogy.diorite_stairs": "Escaleras de Diorita", "block.mineralogy.diorite_slab": "Losa de Diorita", - "block.mineralogy.diorite_brick": "Ladrillo de Diorita", - "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillo de Diorita", - "block.mineralogy.diorite_brick_slab": "Losa de ladrillo de Diorita", - "block.mineralogy.diorite_smooth": "Diorita pulida", - "block.mineralogy.diorite_smooth_stairs": "Escaleras de Diorita pulida", - "block.mineralogy.diorite_smooth_slab": "Losa de Diorita pulida", - "block.mineralogy.diorite_smooth_brick": "Ladrillo de Diorita pulido", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillo de Diorita pulida", - "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillo de Diorita pulida", + "block.mineralogy.diorite_brick": "Ladrillos de Diorita", + "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillos de Diorita", + "block.mineralogy.diorite_brick_slab": "Losa de ladrillos de Diorita", + "block.mineralogy.diorite_smooth": "Bloque pulido de Diorita", + "block.mineralogy.diorite_smooth_stairs": "Escaleras pulidas de Diorita", + "block.mineralogy.diorite_smooth_slab": "Losa pulida de Diorita", + "block.mineralogy.diorite_smooth_brick": "Ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillos pulidos de Diorita", "block.mineralogy.granite": "Granito", "block.mineralogy.granite_stairs": "Escaleras de Granito", "block.mineralogy.granite_slab": "Losa de Granito", - "block.mineralogy.granite_brick": "Ladrillo de Granito", - "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillo de Granito", - "block.mineralogy.granite_brick_slab": "Losa de ladrillo de Granito", - "block.mineralogy.granite_smooth": "Granito pulida", - "block.mineralogy.granite_smooth_stairs": "Escaleras de Granito pulida", - "block.mineralogy.granite_smooth_slab": "Losa de Granito pulida", - "block.mineralogy.granite_smooth_brick": "Ladrillo de Granito pulido", - "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillo de Granito pulida", - "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillo de Granito pulida", + "block.mineralogy.granite_brick": "Ladrillos de Granito", + "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillos de Granito", + "block.mineralogy.granite_brick_slab": "Losa de ladrillos de Granito", + "block.mineralogy.granite_smooth": "Bloque pulido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escaleras pulidas de Granito", + "block.mineralogy.granite_smooth_slab": "Losa pulida de Granito", + "block.mineralogy.granite_smooth_brick": "Ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillos pulidos de Granito", "block.mineralogy.rhyolite": "Riolita", "block.mineralogy.rhyolite_stairs": "Escaleras de Riolita", "block.mineralogy.rhyolite_slab": "Losa de Riolita", - "block.mineralogy.rhyolite_brick": "Ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillo de Riolita", - "block.mineralogy.rhyolite_smooth": "Riolita pulida", - "block.mineralogy.rhyolite_smooth_stairs": "Escaleras de Riolita pulida", - "block.mineralogy.rhyolite_smooth_slab": "Losa de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick": "Ladrillo de Riolita pulido", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillo de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillo de Riolita pulida", + "block.mineralogy.rhyolite_brick": "Ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth": "Bloque pulido de Riolita", + "block.mineralogy.rhyolite_smooth_stairs": "Escaleras pulidas de Riolita", + "block.mineralogy.rhyolite_smooth_slab": "Losa pulida de Riolita", + "block.mineralogy.rhyolite_smooth_brick": "Ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite": "Pegmatita", "block.mineralogy.pegmatite_stairs": "Escaleras de Pegmatita", "block.mineralogy.pegmatite_slab": "Losa de Pegmatita", - "block.mineralogy.pegmatite_brick": "Ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_smooth": "Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_stairs": "Escaleras de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_slab": "Losa de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick": "Ladrillo de Pegmatita pulido", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillo de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillo de Pegmatita pulida", - "block.mineralogy.shale": "Esquisto", - "block.mineralogy.shale_stairs": "Escaleras de Esquisto", - "block.mineralogy.shale_slab": "Losa de Esquisto", - "block.mineralogy.shale_brick": "Ladrillo de Esquisto", - "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.shale_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.shale_smooth": "Esquisto pulida", - "block.mineralogy.shale_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.shale_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.shale_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.pegmatite_brick": "Ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth": "Bloque pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_stairs": "Escaleras pulidas de Pegmatita", + "block.mineralogy.pegmatite_smooth_slab": "Losa pulida de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick": "Ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale": "Lutita", + "block.mineralogy.shale_stairs": "Escaleras de Lutita", + "block.mineralogy.shale_slab": "Losa de Lutita", + "block.mineralogy.shale_brick": "Ladrillos de Lutita", + "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillos de Lutita", + "block.mineralogy.shale_brick_slab": "Losa de ladrillos de Lutita", + "block.mineralogy.shale_smooth": "Bloque pulido de Lutita", + "block.mineralogy.shale_smooth_stairs": "Escaleras pulidas de Lutita", + "block.mineralogy.shale_smooth_slab": "Losa pulida de Lutita", + "block.mineralogy.shale_smooth_brick": "Ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillos pulidos de Lutita", "block.mineralogy.conglomerate": "Conglomerado", "block.mineralogy.conglomerate_stairs": "Escaleras de Conglomerado", "block.mineralogy.conglomerate_slab": "Losa de Conglomerado", - "block.mineralogy.conglomerate_brick": "Ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_smooth": "Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_stairs": "Escaleras de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_slab": "Losa de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick": "Ladrillo de Conglomerado pulido", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillo de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillo de Conglomerado pulida", + "block.mineralogy.conglomerate_brick": "Ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloque pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escaleras pulidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Losa pulida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite": "Dolomita", "block.mineralogy.dolomite_stairs": "Escaleras de Dolomita", "block.mineralogy.dolomite_slab": "Losa de Dolomita", - "block.mineralogy.dolomite_brick": "Ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_slab": "Losa de ladrillo de Dolomita", - "block.mineralogy.dolomite_smooth": "Dolomita pulida", - "block.mineralogy.dolomite_smooth_stairs": "Escaleras de Dolomita pulida", - "block.mineralogy.dolomite_smooth_slab": "Losa de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick": "Ladrillo de Dolomita pulido", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillo de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillo de Dolomita pulida", + "block.mineralogy.dolomite_brick": "Ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Losa de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloque pulido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escaleras pulidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Losa pulida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillos pulidos de Dolomita", "block.mineralogy.limestone": "Caliza", "block.mineralogy.limestone_stairs": "Escaleras de Caliza", "block.mineralogy.limestone_slab": "Losa de Caliza", - "block.mineralogy.limestone_brick": "Ladrillo de Caliza", - "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillo de Caliza", - "block.mineralogy.limestone_brick_slab": "Losa de ladrillo de Caliza", - "block.mineralogy.limestone_smooth": "Caliza pulida", - "block.mineralogy.limestone_smooth_stairs": "Escaleras de Caliza pulida", - "block.mineralogy.limestone_smooth_slab": "Losa de Caliza pulida", - "block.mineralogy.limestone_smooth_brick": "Ladrillo de Caliza pulido", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillo de Caliza pulida", - "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillo de Caliza pulida", + "block.mineralogy.limestone_brick": "Ladrillos de Caliza", + "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillos de Caliza", + "block.mineralogy.limestone_brick_slab": "Losa de ladrillos de Caliza", + "block.mineralogy.limestone_smooth": "Bloque pulido de Caliza", + "block.mineralogy.limestone_smooth_stairs": "Escaleras pulidas de Caliza", + "block.mineralogy.limestone_smooth_slab": "Losa pulida de Caliza", + "block.mineralogy.limestone_smooth_brick": "Ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillos pulidos de Caliza", "block.mineralogy.slate": "Pizarra", "block.mineralogy.slate_stairs": "Escaleras de Pizarra", "block.mineralogy.slate_slab": "Losa de Pizarra", - "block.mineralogy.slate_brick": "Ladrillo de Pizarra", - "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillo de Pizarra", - "block.mineralogy.slate_brick_slab": "Losa de ladrillo de Pizarra", - "block.mineralogy.slate_smooth": "Pizarra pulida", - "block.mineralogy.slate_smooth_stairs": "Escaleras de Pizarra pulida", - "block.mineralogy.slate_smooth_slab": "Losa de Pizarra pulida", - "block.mineralogy.slate_smooth_brick": "Ladrillo de Pizarra pulido", - "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillo de Pizarra pulida", - "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillo de Pizarra pulida", + "block.mineralogy.slate_brick": "Ladrillos de Pizarra", + "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillos de Pizarra", + "block.mineralogy.slate_brick_slab": "Losa de ladrillos de Pizarra", + "block.mineralogy.slate_smooth": "Bloque pulido de Pizarra", + "block.mineralogy.slate_smooth_stairs": "Escaleras pulidas de Pizarra", + "block.mineralogy.slate_smooth_slab": "Losa pulida de Pizarra", + "block.mineralogy.slate_smooth_brick": "Ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillos pulidos de Pizarra", "block.mineralogy.schist": "Esquisto", "block.mineralogy.schist_stairs": "Escaleras de Esquisto", "block.mineralogy.schist_slab": "Losa de Esquisto", - "block.mineralogy.schist_brick": "Ladrillo de Esquisto", - "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.schist_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.schist_smooth": "Esquisto pulida", - "block.mineralogy.schist_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.schist_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.schist_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.schist_brick": "Ladrillos de Esquisto", + "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillos de Esquisto", + "block.mineralogy.schist_brick_slab": "Losa de ladrillos de Esquisto", + "block.mineralogy.schist_smooth": "Bloque pulido de Esquisto", + "block.mineralogy.schist_smooth_stairs": "Escaleras pulidas de Esquisto", + "block.mineralogy.schist_smooth_slab": "Losa pulida de Esquisto", + "block.mineralogy.schist_smooth_brick": "Ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillos pulidos de Esquisto", "block.mineralogy.gneiss": "Gneis", "block.mineralogy.gneiss_stairs": "Escaleras de Gneis", "block.mineralogy.gneiss_slab": "Losa de Gneis", - "block.mineralogy.gneiss_brick": "Ladrillo de Gneis", - "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillo de Gneis", - "block.mineralogy.gneiss_brick_slab": "Losa de ladrillo de Gneis", - "block.mineralogy.gneiss_smooth": "Gneis pulida", - "block.mineralogy.gneiss_smooth_stairs": "Escaleras de Gneis pulida", - "block.mineralogy.gneiss_smooth_slab": "Losa de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick": "Ladrillo de Gneis pulido", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillo de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillo de Gneis pulida", + "block.mineralogy.gneiss_brick": "Ladrillos de Gneis", + "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillos de Gneis", + "block.mineralogy.gneiss_brick_slab": "Losa de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth": "Bloque pulido de Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Escaleras pulidas de Gneis", + "block.mineralogy.gneiss_smooth_slab": "Losa pulida de Gneis", + "block.mineralogy.gneiss_smooth_brick": "Ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillos pulidos de Gneis", "block.mineralogy.marble": "Mármol", "block.mineralogy.marble_stairs": "Escaleras de Mármol", "block.mineralogy.marble_slab": "Losa de Mármol", - "block.mineralogy.marble_brick": "Ladrillo de Mármol", - "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillo de Mármol", - "block.mineralogy.marble_brick_slab": "Losa de ladrillo de Mármol", - "block.mineralogy.marble_smooth": "Mármol pulida", - "block.mineralogy.marble_smooth_stairs": "Escaleras de Mármol pulida", - "block.mineralogy.marble_smooth_slab": "Losa de Mármol pulida", - "block.mineralogy.marble_smooth_brick": "Ladrillo de Mármol pulido", - "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillo de Mármol pulida", - "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillo de Mármol pulida", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaleras de Phyllite", - "block.mineralogy.phyllite_slab": "Losa de Phyllite", - "block.mineralogy.phyllite_brick": "Ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_slab": "Losa de ladrillo de Phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite pulida", - "block.mineralogy.phyllite_smooth_stairs": "Escaleras de Phyllite pulida", - "block.mineralogy.phyllite_smooth_slab": "Losa de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick": "Ladrillo de Phyllite pulido", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillo de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillo de Phyllite pulida", - "block.mineralogy.amphibolite": "Amphibolita", - "block.mineralogy.amphibolite_stairs": "Escaleras de Amphibolita", - "block.mineralogy.amphibolite_slab": "Losa de Amphibolita", - "block.mineralogy.amphibolite_brick": "Ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_smooth": "Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_stairs": "Escaleras de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_slab": "Losa de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick": "Ladrillo de Amphibolita pulido", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillo de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillo de Amphibolita pulida", + "block.mineralogy.marble_brick": "Ladrillos de Mármol", + "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillos de Mármol", + "block.mineralogy.marble_brick_slab": "Losa de ladrillos de Mármol", + "block.mineralogy.marble_smooth": "Bloque pulido de Mármol", + "block.mineralogy.marble_smooth_stairs": "Escaleras pulidas de Mármol", + "block.mineralogy.marble_smooth_slab": "Losa pulida de Mármol", + "block.mineralogy.marble_smooth_brick": "Ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillos pulidos de Mármol", + "block.mineralogy.phyllite": "Filita", + "block.mineralogy.phyllite_stairs": "Escaleras de Filita", + "block.mineralogy.phyllite_slab": "Losa de Filita", + "block.mineralogy.phyllite_brick": "Ladrillos de Filita", + "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillos de Filita", + "block.mineralogy.phyllite_brick_slab": "Losa de ladrillos de Filita", + "block.mineralogy.phyllite_smooth": "Bloque pulido de Filita", + "block.mineralogy.phyllite_smooth_stairs": "Escaleras pulidas de Filita", + "block.mineralogy.phyllite_smooth_slab": "Losa pulida de Filita", + "block.mineralogy.phyllite_smooth_brick": "Ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite": "Anfibolita", + "block.mineralogy.amphibolite_stairs": "Escaleras de Anfibolita", + "block.mineralogy.amphibolite_slab": "Losa de Anfibolita", + "block.mineralogy.amphibolite_brick": "Ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth": "Bloque pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_stairs": "Escaleras pulidas de Anfibolita", + "block.mineralogy.amphibolite_smooth_slab": "Losa pulida de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick": "Ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillos pulidos de Anfibolita", "item.mineralogy.gypsum_dust": "Polvo de yeso", "item.mineralogy.sulfur_dust": "Polvo de azufre", "item.mineralogy.phosphorous_dust": "Polvo de fósforo", "item.mineralogy.nitrate_dust": "Polvo de nitrato", "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", - "block.mineralogy.chert": "Esquisto", + "block.mineralogy.chert": "Sílex", "block.mineralogy.gypsum": "Yeso", - "block.mineralogy.pumice": "Piedra Pómez", + "block.mineralogy.pumice": "Piedra pómez", "block.mineralogy.sulfur_block": "Azufre", - "block.mineralogy.sulfur_ore": "Mineral de azufre", + "block.mineralogy.sulfur_ore": "Mena de azufre", "block.mineralogy.phosphorous_block": "Fósforo", - "block.mineralogy.phosphorous_ore": "Mineral de fósforo", + "block.mineralogy.phosphorous_ore": "Mena de fósforo", "block.mineralogy.nitrate_block": "Nitrato", - "block.mineralogy.nitrate_ore": "Mineral de nitrato", - "block.mineralogy.drywall_black": "Negro panel de yeso", - "block.mineralogy.drywall_red": "Rojo panel de yeso", - "block.mineralogy.drywall_green": "Verde panel de yeso", - "block.mineralogy.drywall_brown": "Marrón panel de yeso", - "block.mineralogy.drywall_blue": "Azul panel de yeso", - "block.mineralogy.drywall_purple": "Púrpura panel de yeso", - "block.mineralogy.drywall_cyan": "Cyan panel de yeso", - "block.mineralogy.drywall_silver": "Plata panel de yeso", - "block.mineralogy.drywall_gray": "Gris panel de yeso", - "block.mineralogy.drywall_pink": "Rosado panel de yeso", - "block.mineralogy.drywall_lime": "Lima panel de yeso", - "block.mineralogy.drywall_yellow": "Amarillo panel de yeso", - "block.mineralogy.drywall_light_blue": "Azul claro panel de yeso", - "block.mineralogy.drywall_magenta": "Magenta panel de yeso", - "block.mineralogy.drywall_orange": "Naranja panel de yeso", - "block.mineralogy.drywall_white": "Blanco panel de yeso", - "block.mineralogy.andesite_wall": "Pared de andesita", - "block.mineralogy.andesite_brick_wall": "Pared de ladrillo de andesita", - "block.mineralogy.andesite_smooth_wall": "Pared Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_wall": "Pared de ladrillo pulido Andesite", - "block.mineralogy.basalt_wall": "Pared de basalto", - "block.mineralogy.basalt_brick_wall": "Pared de ladrillo de basalto", - "block.mineralogy.basalt_smooth_wall": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_wall": "Pared de ladrillo pulido de basalto", - "block.mineralogy.diorite_wall": "Pared de Diorita", - "block.mineralogy.diorite_brick_wall": "Pared de ladrillo de diorita", - "block.mineralogy.diorite_smooth_wall": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_wall": "Pared de ladrillo pulido de diorita", - "block.mineralogy.granite_wall": "Pared de granito", - "block.mineralogy.granite_brick_wall": "Pared de ladrillo de granito", - "block.mineralogy.granite_smooth_wall": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_wall": "Pared de ladrillo pulido de granito", - "block.mineralogy.rhyolite_wall": "Pared de riolita", - "block.mineralogy.rhyolite_brick_wall": "Pared de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_wall": "Pared pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_wall": "Pared de ladrillo pulido de riolita", - "block.mineralogy.pegmatite_wall": "Pared de Pegmatita", - "block.mineralogy.pegmatite_brick_wall": "Pared de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_wall": "Pared pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pared de ladrillo pulido de pegmatita", - "block.mineralogy.shale_wall": "Muro de pizarra", - "block.mineralogy.shale_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.shale_smooth_wall": "Pared pulida de pizarra", - "block.mineralogy.shale_smooth_brick_wall": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_wall": "Pared de conglomerado", - "block.mineralogy.conglomerate_brick_wall": "Pared de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_wall": "Pared pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerado, pulido, pared de ladrillo", + "block.mineralogy.nitrate_ore": "Mena de nitrato", + "block.mineralogy.drywall_black": "Panel de yeso negro", + "block.mineralogy.drywall_red": "Panel de yeso rojo", + "block.mineralogy.drywall_green": "Panel de yeso verde", + "block.mineralogy.drywall_brown": "Panel de yeso marrón", + "block.mineralogy.drywall_blue": "Panel de yeso azul", + "block.mineralogy.drywall_purple": "Panel de yeso morado", + "block.mineralogy.drywall_cyan": "Panel de yeso cian", + "block.mineralogy.drywall_silver": "Panel de yeso gris claro", + "block.mineralogy.drywall_gray": "Panel de yeso gris", + "block.mineralogy.drywall_pink": "Panel de yeso rosa", + "block.mineralogy.drywall_lime": "Panel de yeso verde lima", + "block.mineralogy.drywall_yellow": "Panel de yeso amarillo", + "block.mineralogy.drywall_light_blue": "Panel de yeso azul claro", + "block.mineralogy.drywall_magenta": "Panel de yeso magenta", + "block.mineralogy.drywall_orange": "Panel de yeso naranja", + "block.mineralogy.drywall_white": "Panel de yeso blanco", + "block.mineralogy.andesite_wall": "Muro de Andesita", + "block.mineralogy.andesite_brick_wall": "Muro de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_wall": "Muro pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de ladrillos pulidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorita", + "block.mineralogy.diorite_brick_wall": "Muro de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_wall": "Muro pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de ladrillos pulidos de Diorita", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de ladrillos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro pulido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolita", + "block.mineralogy.rhyolite_brick_wall": "Muro de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_wall": "Muro pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de ladrillos pulidos de Riolita", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatita", + "block.mineralogy.pegmatite_brick_wall": "Muro de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_wall": "Muro pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_wall": "Muro de Lutita", + "block.mineralogy.shale_brick_wall": "Muro de ladrillos de Lutita", + "block.mineralogy.shale_smooth_wall": "Muro pulido de Lutita", + "block.mineralogy.shale_smooth_brick_wall": "Muro de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite_wall": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_wall": "Pared de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_wall": "Pared pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_wall": "Pared de ladrillo pulido de dolomita", - "block.mineralogy.limestone_wall": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_wall": "Pared de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_wall": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_wall": "Pared de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_wall": "Muro de mármol", - "block.mineralogy.marble_brick_wall": "Pared de ladrillo de mármol", - "block.mineralogy.marble_smooth_wall": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_wall": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_wall": "Pared de pizarra", - "block.mineralogy.slate_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.slate_smooth_wall": "Pared pulida pizarra", - "block.mineralogy.slate_smooth_brick_wall": "Pared de ladrillo pulido pizarra", - "block.mineralogy.schist_wall": "Muro de esquisto", - "block.mineralogy.schist_brick_wall": "Pared de ladrillo esquist", - "block.mineralogy.schist_smooth_wall": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_wall": "Pared de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_wall": "Muro de gneis", - "block.mineralogy.gneiss_brick_wall": "Pared de ladrillo gneis", - "block.mineralogy.gneiss_smooth_wall": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_wall": "Pared de Phyllite", - "block.mineralogy.phyllite_brick_wall": "Pared de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_wall": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_wall": "Pared de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_wall": "Pared de anfibolita", - "block.mineralogy.amphibolite_brick_wall": "Pared de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_wall": "Pared pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_wall": "Pared de ladrillo pulido de anfibolita", - "block.mineralogy.andesite_furnace": "Horno de andesita", - "block.mineralogy.andesite_brick_furnace": "Horno de ladrillo de andesita", - "block.mineralogy.andesite_smooth_furnace": "Horno Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillo pulido Andesite", - "block.mineralogy.basalt_furnace": "Horno de basalto", - "block.mineralogy.basalt_brick_furnace": "Horno de ladrillo de basalto", - "block.mineralogy.basalt_smooth_furnace": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillo pulido de basalto", + "block.mineralogy.dolomite_brick_wall": "Muro de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Caliza", + "block.mineralogy.limestone_brick_wall": "Muro de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_wall": "Muro pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de ladrillos pulidos de Caliza", + "block.mineralogy.marble_wall": "Muro de Mármol", + "block.mineralogy.marble_brick_wall": "Muro de ladrillos de Mármol", + "block.mineralogy.marble_smooth_wall": "Muro pulido de Mármol", + "block.mineralogy.marble_smooth_brick_wall": "Muro de ladrillos pulidos de Mármol", + "block.mineralogy.slate_wall": "Muro de Pizarra", + "block.mineralogy.slate_brick_wall": "Muro de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_wall": "Muro pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_wall": "Muro de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_wall": "Muro de Esquisto", + "block.mineralogy.schist_brick_wall": "Muro de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_wall": "Muro pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_wall": "Muro de Gneis", + "block.mineralogy.gneiss_brick_wall": "Muro de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_wall": "Muro pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_wall": "Muro de Filita", + "block.mineralogy.phyllite_brick_wall": "Muro de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_wall": "Muro pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolita", + "block.mineralogy.amphibolite_brick_wall": "Muro de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_wall": "Muro pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de ladrillos pulidos de Anfibolita", + "block.mineralogy.andesite_furnace": "Horno de Andesita", + "block.mineralogy.andesite_brick_furnace": "Horno de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_furnace": "Horno pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_furnace": "Horno de Basalto", + "block.mineralogy.basalt_brick_furnace": "Horno de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Horno pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillos pulidos de Basalto", "block.mineralogy.diorite_furnace": "Horno de Diorita", - "block.mineralogy.diorite_brick_furnace": "Horno de ladrillo de diorita", - "block.mineralogy.diorite_smooth_furnace": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillo pulido de diorita", - "block.mineralogy.granite_furnace": "Horno de granito", - "block.mineralogy.granite_brick_furnace": "Horno de ladrillo de granito", - "block.mineralogy.granite_smooth_furnace": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillo pulido de granito", - "block.mineralogy.rhyolite_furnace": "Horno de riolita", - "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_furnace": "Horno pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillo pulido de riolita", + "block.mineralogy.diorite_brick_furnace": "Horno de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_furnace": "Horno pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillos pulidos de Diorita", + "block.mineralogy.granite_furnace": "Horno de Granito", + "block.mineralogy.granite_brick_furnace": "Horno de ladrillos de Granito", + "block.mineralogy.granite_smooth_furnace": "Horno pulido de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_furnace": "Horno de Riolita", + "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_furnace": "Horno pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite_furnace": "Horno de Pegmatita", - "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_furnace": "Horno pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillo pulido de pegmatita", - "block.mineralogy.shale_furnace": "Muro de pizarra", - "block.mineralogy.shale_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.shale_smooth_furnace": "Horno pulida de pizarra", - "block.mineralogy.shale_smooth_brick_furnace": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_furnace": "Horno de conglomerado", - "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_furnace": "Horno pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerado, pulido, pared de ladrillo", - "block.mineralogy.dolomite_furnace": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_furnace": "Horno pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillo pulido de dolomita", - "block.mineralogy.limestone_furnace": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_furnace": "Horno de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_furnace": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_furnace": "Muro de mármol", - "block.mineralogy.marble_brick_furnace": "Horno de ladrillo de mármol", - "block.mineralogy.marble_smooth_furnace": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_furnace": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_furnace": "Horno de pizarra", - "block.mineralogy.slate_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.slate_smooth_furnace": "Horno pulida pizarra", - "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillo pulido pizarra", - "block.mineralogy.schist_furnace": "Muro de esquisto", - "block.mineralogy.schist_brick_furnace": "Horno de ladrillo esquist", - "block.mineralogy.schist_smooth_furnace": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_furnace": "Muro de gneis", - "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillo gneis", - "block.mineralogy.gneiss_smooth_furnace": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_furnace": "Horno de Phyllite", - "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_furnace": "Horno de anfibolita", - "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_furnace": "Horno pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillo pulido de anfibolita", + "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_furnace": "Horno pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_furnace": "Horno de Lutita", + "block.mineralogy.shale_brick_furnace": "Horno de ladrillos de Lutita", + "block.mineralogy.shale_smooth_furnace": "Horno pulido de Lutita", + "block.mineralogy.shale_smooth_brick_furnace": "Horno de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_furnace": "Horno de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Horno pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Horno de ladrillos pulidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Horno de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Horno pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_furnace": "Horno de Caliza", + "block.mineralogy.limestone_brick_furnace": "Horno de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_furnace": "Horno pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillos pulidos de Caliza", + "block.mineralogy.marble_furnace": "Horno de Mármol", + "block.mineralogy.marble_brick_furnace": "Horno de ladrillos de Mármol", + "block.mineralogy.marble_smooth_furnace": "Horno pulido de Mármol", + "block.mineralogy.marble_smooth_brick_furnace": "Horno de ladrillos pulidos de Mármol", + "block.mineralogy.slate_furnace": "Horno de Pizarra", + "block.mineralogy.slate_brick_furnace": "Horno de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_furnace": "Horno pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_furnace": "Horno de Esquisto", + "block.mineralogy.schist_brick_furnace": "Horno de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_furnace": "Horno pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_furnace": "Horno de Gneis", + "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Horno pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Horno de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_furnace": "Horno de Filita", + "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_furnace": "Horno pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_furnace": "Horno de Anfibolita", + "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_furnace": "Horno pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Anfibolita", "block.mineralogy.diabase": "Diabasa", - "block.mineralogy.diabase_stairs": "Diabasa Escalera", - "block.mineralogy.diabase_slab": "Diabasa Losa", - "block.mineralogy.diabase_brick": "Diabasa Ladrillo", - "block.mineralogy.diabase_brick_stairs": "Diabasa Escaleras de ladrillo", - "block.mineralogy.diabase_brick_slab": "Diabasa Losa de ladrillo", - "block.mineralogy.diabase_smooth": "Polished Diabasa", - "block.mineralogy.diabase_smooth_stairs": "Diabasa Escaleras pulidas", - "block.mineralogy.diabase_smooth_slab": "Diabasa Losa pulida", - "block.mineralogy.diabase_smooth_brick": "Diabasa Ladrillo pulido", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabasa Polished Escaleras de ladrillo", - "block.mineralogy.diabase_smooth_brick_slab": "Diabasa Polished Losa de ladrillo", - "block.mineralogy.diabase_wall": "Diabasa pared", - "block.mineralogy.diabase_brick_wall": "Diabasa Pared de ladrillo", - "block.mineralogy.diabase_smooth_wall": "Diabasa Pared pulida", - "block.mineralogy.diabase_smooth_brick_wall": "Diabasa Ladrillo pulido pared", - "block.mineralogy.diabase_furnace": "Diabasa Horno", - "block.mineralogy.diabase_brick_furnace": "Diabasa Horno de ladrillo", - "block.mineralogy.diabase_smooth_furnace": "Diabasa Horno pulido", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabasa Ladrillo pulido Horno", - "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escalera", - "block.mineralogy.gabbro_slab": "Gabbro Losa", - "block.mineralogy.gabbro_brick": "Gabbro Ladrillo", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escaleras de ladrillo", - "block.mineralogy.gabbro_brick_slab": "Gabbro Losa de ladrillo", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escaleras pulidas", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Losa pulida", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Ladrillo pulido", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polished Escaleras de ladrillo", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polished Losa de ladrillo", - "block.mineralogy.gabbro_wall": "Gabbro pared", - "block.mineralogy.gabbro_brick_wall": "Gabbro Pared de ladrillo", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Pared pulida", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Ladrillo pulido pared", - "block.mineralogy.gabbro_furnace": "Gabbro Horno", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Horno de ladrillo", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Horno pulido", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Ladrillo pulido Horno", + "block.mineralogy.diabase_stairs": "Escaleras de Diabasa", + "block.mineralogy.diabase_slab": "Losa de Diabasa", + "block.mineralogy.diabase_brick": "Ladrillos de Diabasa", + "block.mineralogy.diabase_brick_stairs": "Escaleras de ladrillos de Diabasa", + "block.mineralogy.diabase_brick_slab": "Losa de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth": "Bloque pulido de Diabasa", + "block.mineralogy.diabase_smooth_stairs": "Escaleras pulidas de Diabasa", + "block.mineralogy.diabase_smooth_slab": "Losa pulida de Diabasa", + "block.mineralogy.diabase_smooth_brick": "Ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_slab": "Losa de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_wall": "Muro de Diabasa", + "block.mineralogy.diabase_brick_wall": "Muro de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_wall": "Muro pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_furnace": "Horno de Diabasa", + "block.mineralogy.diabase_brick_furnace": "Horno de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_furnace": "Horno pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_furnace": "Horno de ladrillos pulidos de Diabasa", + "block.mineralogy.gabbro": "Gabro", + "block.mineralogy.gabbro_stairs": "Escaleras de Gabro", + "block.mineralogy.gabbro_slab": "Losa de Gabro", + "block.mineralogy.gabbro_brick": "Ladrillos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escaleras de ladrillos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Losa de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloque pulido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escaleras pulidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Losa pulida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Losa de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_furnace": "Horno de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Horno de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Horno pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Horno de ladrillos pulidos de Gabro", "block.mineralogy.peridotite": "Peridotita", - "block.mineralogy.peridotite_stairs": "Peridotita Escalera", - "block.mineralogy.peridotite_slab": "Peridotita Losa", - "block.mineralogy.peridotite_brick": "Peridotita Ladrillo", - "block.mineralogy.peridotite_brick_stairs": "Peridotita Escaleras de ladrillo", - "block.mineralogy.peridotite_brick_slab": "Peridotita Losa de ladrillo", - "block.mineralogy.peridotite_smooth": "Polished Peridotita", - "block.mineralogy.peridotite_smooth_stairs": "Peridotita Escaleras pulidas", - "block.mineralogy.peridotite_smooth_slab": "Peridotita Losa pulida", - "block.mineralogy.peridotite_smooth_brick": "Peridotita Ladrillo pulido", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotita Polished Escaleras de ladrillo", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotita Polished Losa de ladrillo", - "block.mineralogy.peridotite_wall": "Peridotita pared", - "block.mineralogy.peridotite_brick_wall": "Peridotita Pared de ladrillo", - "block.mineralogy.peridotite_smooth_wall": "Peridotita Pared pulida", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotita Ladrillo pulido pared", - "block.mineralogy.peridotite_furnace": "Peridotita Horno", - "block.mineralogy.peridotite_brick_furnace": "Peridotita Horno de ladrillo", - "block.mineralogy.peridotite_smooth_furnace": "Peridotita Horno pulido", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotita Ladrillo pulido Horno", + "block.mineralogy.peridotite_stairs": "Escaleras de Peridotita", + "block.mineralogy.peridotite_slab": "Losa de Peridotita", + "block.mineralogy.peridotite_brick": "Ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_stairs": "Escaleras de ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_slab": "Losa de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth": "Bloque pulido de Peridotita", + "block.mineralogy.peridotite_smooth_stairs": "Escaleras pulidas de Peridotita", + "block.mineralogy.peridotite_smooth_slab": "Losa pulida de Peridotita", + "block.mineralogy.peridotite_smooth_brick": "Ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_slab": "Losa de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_wall": "Muro de Peridotita", + "block.mineralogy.peridotite_brick_wall": "Muro de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_wall": "Muro pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_furnace": "Horno de Peridotita", + "block.mineralogy.peridotite_brick_furnace": "Horno de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_furnace": "Horno pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_furnace": "Horno de ladrillos pulidos de Peridotita", "block.mineralogy.basaltic_glass": "Vidrio basáltico", - "block.mineralogy.basaltic_glass_stairs": "Vidrio basáltico Escalera", - "block.mineralogy.basaltic_glass_slab": "Vidrio basáltico Losa", - "block.mineralogy.basaltic_glass_brick": "Vidrio basáltico Ladrillo", - "block.mineralogy.basaltic_glass_brick_stairs": "Vidrio basáltico Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_brick_slab": "Vidrio basáltico Losa de ladrillo", - "block.mineralogy.basaltic_glass_smooth": "Polished Vidrio basáltico", - "block.mineralogy.basaltic_glass_smooth_stairs": "Vidrio basáltico Escaleras pulidas", - "block.mineralogy.basaltic_glass_smooth_slab": "Vidrio basáltico Losa pulida", - "block.mineralogy.basaltic_glass_smooth_brick": "Vidrio basáltico Ladrillo pulido", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Vidrio basáltico Polished Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Vidrio basáltico Polished Losa de ladrillo", - "block.mineralogy.basaltic_glass_wall": "Vidrio basáltico pared", - "block.mineralogy.basaltic_glass_brick_wall": "Vidrio basáltico Pared de ladrillo", - "block.mineralogy.basaltic_glass_smooth_wall": "Vidrio basáltico Pared pulida", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Vidrio basáltico Ladrillo pulido pared", - "block.mineralogy.basaltic_glass_furnace": "Vidrio basáltico Horno", - "block.mineralogy.basaltic_glass_brick_furnace": "Vidrio basáltico Horno de ladrillo", - "block.mineralogy.basaltic_glass_smooth_furnace": "Vidrio basáltico Horno pulido", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Vidrio basáltico Ladrillo pulido Horno", + "block.mineralogy.basaltic_glass_stairs": "Escaleras de Vidrio basáltico", + "block.mineralogy.basaltic_glass_slab": "Losa de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick": "Ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escaleras de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Losa de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloque pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escaleras pulidas de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Losa pulida de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Losa de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_furnace": "Horno de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Horno de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Horno pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Horno de ladrillos pulidos de Vidrio basáltico", "block.mineralogy.scoria": "Escoria", - "block.mineralogy.scoria_stairs": "Escoria Escalera", - "block.mineralogy.scoria_slab": "Escoria Losa", - "block.mineralogy.scoria_brick": "Escoria Ladrillo", - "block.mineralogy.scoria_brick_stairs": "Escoria Escaleras de ladrillo", - "block.mineralogy.scoria_brick_slab": "Escoria Losa de ladrillo", - "block.mineralogy.scoria_smooth": "Polished Escoria", - "block.mineralogy.scoria_smooth_stairs": "Escoria Escaleras pulidas", - "block.mineralogy.scoria_smooth_slab": "Escoria Losa pulida", - "block.mineralogy.scoria_smooth_brick": "Escoria Ladrillo pulido", - "block.mineralogy.scoria_smooth_brick_stairs": "Escoria Polished Escaleras de ladrillo", - "block.mineralogy.scoria_smooth_brick_slab": "Escoria Polished Losa de ladrillo", - "block.mineralogy.scoria_wall": "Escoria pared", - "block.mineralogy.scoria_brick_wall": "Escoria Pared de ladrillo", - "block.mineralogy.scoria_smooth_wall": "Escoria Pared pulida", - "block.mineralogy.scoria_smooth_brick_wall": "Escoria Ladrillo pulido pared", - "block.mineralogy.scoria_furnace": "Escoria Horno", - "block.mineralogy.scoria_brick_furnace": "Escoria Horno de ladrillo", - "block.mineralogy.scoria_smooth_furnace": "Escoria Horno pulido", - "block.mineralogy.scoria_smooth_brick_furnace": "Escoria Ladrillo pulido Horno", + "block.mineralogy.scoria_stairs": "Escaleras de Escoria", + "block.mineralogy.scoria_slab": "Losa de Escoria", + "block.mineralogy.scoria_brick": "Ladrillos de Escoria", + "block.mineralogy.scoria_brick_stairs": "Escaleras de ladrillos de Escoria", + "block.mineralogy.scoria_brick_slab": "Losa de ladrillos de Escoria", + "block.mineralogy.scoria_smooth": "Bloque pulido de Escoria", + "block.mineralogy.scoria_smooth_stairs": "Escaleras pulidas de Escoria", + "block.mineralogy.scoria_smooth_slab": "Losa pulida de Escoria", + "block.mineralogy.scoria_smooth_brick": "Ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_slab": "Losa de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_wall": "Muro de Escoria", + "block.mineralogy.scoria_brick_wall": "Muro de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_wall": "Muro pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_furnace": "Horno de Escoria", + "block.mineralogy.scoria_brick_furnace": "Horno de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_furnace": "Horno pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Horno de ladrillos pulidos de Escoria", "block.mineralogy.tuff": "Toba", - "block.mineralogy.tuff_stairs": "Toba Escalera", - "block.mineralogy.tuff_slab": "Toba Losa", - "block.mineralogy.tuff_brick": "Toba Ladrillo", - "block.mineralogy.tuff_brick_stairs": "Toba Escaleras de ladrillo", - "block.mineralogy.tuff_brick_slab": "Toba Losa de ladrillo", - "block.mineralogy.tuff_smooth": "Polished Toba", - "block.mineralogy.tuff_smooth_stairs": "Toba Escaleras pulidas", - "block.mineralogy.tuff_smooth_slab": "Toba Losa pulida", - "block.mineralogy.tuff_smooth_brick": "Toba Ladrillo pulido", - "block.mineralogy.tuff_smooth_brick_stairs": "Toba Polished Escaleras de ladrillo", - "block.mineralogy.tuff_smooth_brick_slab": "Toba Polished Losa de ladrillo", - "block.mineralogy.tuff_wall": "Toba pared", - "block.mineralogy.tuff_brick_wall": "Toba Pared de ladrillo", - "block.mineralogy.tuff_smooth_wall": "Toba Pared pulida", - "block.mineralogy.tuff_smooth_brick_wall": "Toba Ladrillo pulido pared", - "block.mineralogy.tuff_furnace": "Toba Horno", - "block.mineralogy.tuff_brick_furnace": "Toba Horno de ladrillo", - "block.mineralogy.tuff_smooth_furnace": "Toba Horno pulido", - "block.mineralogy.tuff_smooth_brick_furnace": "Toba Ladrillo pulido Horno", - "block.mineralogy.siltstone": "Siltstone", - "block.mineralogy.siltstone_stairs": "Siltstone Escalera", - "block.mineralogy.siltstone_slab": "Siltstone Losa", - "block.mineralogy.siltstone_brick": "Siltstone Ladrillo", - "block.mineralogy.siltstone_brick_stairs": "Siltstone Escaleras de ladrillo", - "block.mineralogy.siltstone_brick_slab": "Siltstone Losa de ladrillo", - "block.mineralogy.siltstone_smooth": "Polished Siltstone", - "block.mineralogy.siltstone_smooth_stairs": "Siltstone Escaleras pulidas", - "block.mineralogy.siltstone_smooth_slab": "Siltstone Losa pulida", - "block.mineralogy.siltstone_smooth_brick": "Siltstone Ladrillo pulido", - "block.mineralogy.siltstone_smooth_brick_stairs": "Siltstone Polished Escaleras de ladrillo", - "block.mineralogy.siltstone_smooth_brick_slab": "Siltstone Polished Losa de ladrillo", - "block.mineralogy.siltstone_wall": "Siltstone pared", - "block.mineralogy.siltstone_brick_wall": "Siltstone Pared de ladrillo", - "block.mineralogy.siltstone_smooth_wall": "Siltstone Pared pulida", - "block.mineralogy.siltstone_smooth_brick_wall": "Siltstone Ladrillo pulido pared", - "block.mineralogy.siltstone_furnace": "Siltstone Horno", - "block.mineralogy.siltstone_brick_furnace": "Siltstone Horno de ladrillo", - "block.mineralogy.siltstone_smooth_furnace": "Siltstone Horno pulido", - "block.mineralogy.siltstone_smooth_brick_furnace": "Siltstone Ladrillo pulido Horno", + "block.mineralogy.tuff_stairs": "Escaleras de Toba", + "block.mineralogy.tuff_slab": "Losa de Toba", + "block.mineralogy.tuff_brick": "Ladrillos de Toba", + "block.mineralogy.tuff_brick_stairs": "Escaleras de ladrillos de Toba", + "block.mineralogy.tuff_brick_slab": "Losa de ladrillos de Toba", + "block.mineralogy.tuff_smooth": "Bloque pulido de Toba", + "block.mineralogy.tuff_smooth_stairs": "Escaleras pulidas de Toba", + "block.mineralogy.tuff_smooth_slab": "Losa pulida de Toba", + "block.mineralogy.tuff_smooth_brick": "Ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_slab": "Losa de ladrillos pulidos de Toba", + "block.mineralogy.tuff_wall": "Muro de Toba", + "block.mineralogy.tuff_brick_wall": "Muro de ladrillos de Toba", + "block.mineralogy.tuff_smooth_wall": "Muro pulido de Toba", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de ladrillos pulidos de Toba", + "block.mineralogy.tuff_furnace": "Horno de Toba", + "block.mineralogy.tuff_brick_furnace": "Horno de ladrillos de Toba", + "block.mineralogy.tuff_smooth_furnace": "Horno pulido de Toba", + "block.mineralogy.tuff_smooth_brick_furnace": "Horno de ladrillos pulidos de Toba", + "block.mineralogy.siltstone": "Limolita", + "block.mineralogy.siltstone_stairs": "Escaleras de Limolita", + "block.mineralogy.siltstone_slab": "Losa de Limolita", + "block.mineralogy.siltstone_brick": "Ladrillos de Limolita", + "block.mineralogy.siltstone_brick_stairs": "Escaleras de ladrillos de Limolita", + "block.mineralogy.siltstone_brick_slab": "Losa de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth": "Bloque pulido de Limolita", + "block.mineralogy.siltstone_smooth_stairs": "Escaleras pulidas de Limolita", + "block.mineralogy.siltstone_smooth_slab": "Losa pulida de Limolita", + "block.mineralogy.siltstone_smooth_brick": "Ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_slab": "Losa de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_wall": "Muro de Limolita", + "block.mineralogy.siltstone_brick_wall": "Muro de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_wall": "Muro pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_furnace": "Horno de Limolita", + "block.mineralogy.siltstone_brick_furnace": "Horno de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_furnace": "Horno pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_furnace": "Horno de ladrillos pulidos de Limolita", "block.mineralogy.rock_salt": "Sal de roca", - "block.mineralogy.rock_salt_stairs": "Sal de roca Escalera", - "block.mineralogy.rock_salt_slab": "Sal de roca Losa", - "block.mineralogy.rock_salt_brick": "Sal de roca Ladrillo", - "block.mineralogy.rock_salt_brick_stairs": "Sal de roca Escaleras de ladrillo", - "block.mineralogy.rock_salt_brick_slab": "Sal de roca Losa de ladrillo", - "block.mineralogy.rock_salt_smooth": "Polished Sal de roca", - "block.mineralogy.rock_salt_smooth_stairs": "Sal de roca Escaleras pulidas", - "block.mineralogy.rock_salt_smooth_slab": "Sal de roca Losa pulida", - "block.mineralogy.rock_salt_smooth_brick": "Sal de roca Ladrillo pulido", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sal de roca Polished Escaleras de ladrillo", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sal de roca Polished Losa de ladrillo", - "block.mineralogy.rock_salt_wall": "Sal de roca pared", - "block.mineralogy.rock_salt_brick_wall": "Sal de roca Pared de ladrillo", - "block.mineralogy.rock_salt_smooth_wall": "Sal de roca Pared pulida", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sal de roca Ladrillo pulido pared", - "block.mineralogy.rock_salt_furnace": "Sal de roca Horno", - "block.mineralogy.rock_salt_brick_furnace": "Sal de roca Horno de ladrillo", - "block.mineralogy.rock_salt_smooth_furnace": "Sal de roca Horno pulido", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sal de roca Ladrillo pulido Horno", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escalera", - "block.mineralogy.hornfels_slab": "Hornfels Losa", - "block.mineralogy.hornfels_brick": "Hornfels Ladrillo", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escaleras de ladrillo", - "block.mineralogy.hornfels_brick_slab": "Hornfels Losa de ladrillo", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escaleras pulidas", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Losa pulida", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Ladrillo pulido", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polished Escaleras de ladrillo", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polished Losa de ladrillo", - "block.mineralogy.hornfels_wall": "Hornfels pared", - "block.mineralogy.hornfels_brick_wall": "Hornfels Pared de ladrillo", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Pared pulida", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Ladrillo pulido pared", - "block.mineralogy.hornfels_furnace": "Hornfels Horno", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Horno de ladrillo", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Horno pulido", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Ladrillo pulido Horno", + "block.mineralogy.rock_salt_stairs": "Escaleras de Sal de roca", + "block.mineralogy.rock_salt_slab": "Losa de Sal de roca", + "block.mineralogy.rock_salt_brick": "Ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_stairs": "Escaleras de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_slab": "Losa de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth": "Bloque pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_stairs": "Escaleras pulidas de Sal de roca", + "block.mineralogy.rock_salt_smooth_slab": "Losa pulida de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick": "Ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_slab": "Losa de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_wall": "Muro de Sal de roca", + "block.mineralogy.rock_salt_brick_wall": "Muro de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_wall": "Muro pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_furnace": "Horno de Sal de roca", + "block.mineralogy.rock_salt_brick_furnace": "Horno de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_furnace": "Horno pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Horno de ladrillos pulidos de Sal de roca", + "block.mineralogy.hornfels": "Corneana", + "block.mineralogy.hornfels_stairs": "Escaleras de Corneana", + "block.mineralogy.hornfels_slab": "Losa de Corneana", + "block.mineralogy.hornfels_brick": "Ladrillos de Corneana", + "block.mineralogy.hornfels_brick_stairs": "Escaleras de ladrillos de Corneana", + "block.mineralogy.hornfels_brick_slab": "Losa de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth": "Bloque pulido de Corneana", + "block.mineralogy.hornfels_smooth_stairs": "Escaleras pulidas de Corneana", + "block.mineralogy.hornfels_smooth_slab": "Losa pulida de Corneana", + "block.mineralogy.hornfels_smooth_brick": "Ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_slab": "Losa de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_wall": "Muro de Corneana", + "block.mineralogy.hornfels_brick_wall": "Muro de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_wall": "Muro pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_furnace": "Horno de Corneana", + "block.mineralogy.hornfels_brick_furnace": "Horno de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_furnace": "Horno pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_furnace": "Horno de ladrillos pulidos de Corneana", "block.mineralogy.quartzite": "Cuarcita", - "block.mineralogy.quartzite_stairs": "Cuarcita Escalera", - "block.mineralogy.quartzite_slab": "Cuarcita Losa", - "block.mineralogy.quartzite_brick": "Cuarcita Ladrillo", - "block.mineralogy.quartzite_brick_stairs": "Cuarcita Escaleras de ladrillo", - "block.mineralogy.quartzite_brick_slab": "Cuarcita Losa de ladrillo", - "block.mineralogy.quartzite_smooth": "Polished Cuarcita", - "block.mineralogy.quartzite_smooth_stairs": "Cuarcita Escaleras pulidas", - "block.mineralogy.quartzite_smooth_slab": "Cuarcita Losa pulida", - "block.mineralogy.quartzite_smooth_brick": "Cuarcita Ladrillo pulido", - "block.mineralogy.quartzite_smooth_brick_stairs": "Cuarcita Polished Escaleras de ladrillo", - "block.mineralogy.quartzite_smooth_brick_slab": "Cuarcita Polished Losa de ladrillo", - "block.mineralogy.quartzite_wall": "Cuarcita pared", - "block.mineralogy.quartzite_brick_wall": "Cuarcita Pared de ladrillo", - "block.mineralogy.quartzite_smooth_wall": "Cuarcita Pared pulida", - "block.mineralogy.quartzite_smooth_brick_wall": "Cuarcita Ladrillo pulido pared", - "block.mineralogy.quartzite_furnace": "Cuarcita Horno", - "block.mineralogy.quartzite_brick_furnace": "Cuarcita Horno de ladrillo", - "block.mineralogy.quartzite_smooth_furnace": "Cuarcita Horno pulido", - "block.mineralogy.quartzite_smooth_brick_furnace": "Cuarcita Ladrillo pulido Horno", + "block.mineralogy.quartzite_stairs": "Escaleras de Cuarcita", + "block.mineralogy.quartzite_slab": "Losa de Cuarcita", + "block.mineralogy.quartzite_brick": "Ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_stairs": "Escaleras de ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_slab": "Losa de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth": "Bloque pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_stairs": "Escaleras pulidas de Cuarcita", + "block.mineralogy.quartzite_smooth_slab": "Losa pulida de Cuarcita", + "block.mineralogy.quartzite_smooth_brick": "Ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_slab": "Losa de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_wall": "Muro de Cuarcita", + "block.mineralogy.quartzite_brick_wall": "Muro de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_wall": "Muro pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_furnace": "Horno de Cuarcita", + "block.mineralogy.quartzite_brick_furnace": "Horno de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_furnace": "Horno pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_furnace": "Horno de ladrillos pulidos de Cuarcita", "block.mineralogy.novaculite": "Novaculita", - "block.mineralogy.novaculite_stairs": "Novaculita Escalera", - "block.mineralogy.novaculite_slab": "Novaculita Losa", - "block.mineralogy.novaculite_brick": "Novaculita Ladrillo", - "block.mineralogy.novaculite_brick_stairs": "Novaculita Escaleras de ladrillo", - "block.mineralogy.novaculite_brick_slab": "Novaculita Losa de ladrillo", - "block.mineralogy.novaculite_smooth": "Polished Novaculita", - "block.mineralogy.novaculite_smooth_stairs": "Novaculita Escaleras pulidas", - "block.mineralogy.novaculite_smooth_slab": "Novaculita Losa pulida", - "block.mineralogy.novaculite_smooth_brick": "Novaculita Ladrillo pulido", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculita Polished Escaleras de ladrillo", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculita Polished Losa de ladrillo", - "block.mineralogy.novaculite_wall": "Novaculita pared", - "block.mineralogy.novaculite_brick_wall": "Novaculita Pared de ladrillo", - "block.mineralogy.novaculite_smooth_wall": "Novaculita Pared pulida", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculita Ladrillo pulido pared", - "block.mineralogy.novaculite_furnace": "Novaculita Horno", - "block.mineralogy.novaculite_brick_furnace": "Novaculita Horno de ladrillo", - "block.mineralogy.novaculite_smooth_furnace": "Novaculita Horno pulido", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculita Ladrillo pulido Horno", + "block.mineralogy.novaculite_stairs": "Escaleras de Novaculita", + "block.mineralogy.novaculite_slab": "Losa de Novaculita", + "block.mineralogy.novaculite_brick": "Ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escaleras de ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Losa de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloque pulido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escaleras pulidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Losa pulida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Losa de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Horno de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Horno de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Horno pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Horno de ladrillos pulidos de Novaculita", "block.mineralogy.chalk": "Tiza", "item.mineralogy.chalk_dust": "Polvo de tiza", "item.mineralogy.salt_dust": "Sal", "item.mineralogy.rock_salt_dust": "Cristales de sal de roca", "block.mineralogy.rocksaltlamp": "Lámpara de sal de roca", "block.mineralogy.rocksaltstreetlamp": "Farola de sal de roca", - "block.mineralogy.andesite_relief_axe": "Andesita Alivio del hacha", - "block.mineralogy.andesite_relief_blank": "Andesita Alivio en blanco", - "block.mineralogy.andesite_relief_cross": "Andesita Alivio cruzado", - "block.mineralogy.andesite_relief_hammer": "Andesita Alivio del martillo", - "block.mineralogy.andesite_relief_hoe": "Andesita Alivio de azada", - "block.mineralogy.andesite_relief_horizontal": "Andesita Alivio horizontal", - "block.mineralogy.andesite_relief_i": "Andesita I alivio", - "block.mineralogy.andesite_relief_left": "Andesita Alivio izquierdo", - "block.mineralogy.andesite_relief_pickaxe": "Andesita Alivio de pico", - "block.mineralogy.andesite_relief_plus": "Andesita Más alivio", - "block.mineralogy.andesite_relief_right": "Andesita Alivio correcto", - "block.mineralogy.andesite_relief_sword": "Andesita Alivio de espada", - "block.mineralogy.andesite_relief_vertical": "Andesita Alivio vertical", - "block.mineralogy.basalt_relief_axe": "Basalto Alivio del hacha", - "block.mineralogy.basalt_relief_blank": "Basalto Alivio en blanco", - "block.mineralogy.basalt_relief_cross": "Basalto Alivio cruzado", - "block.mineralogy.basalt_relief_hammer": "Basalto Alivio del martillo", - "block.mineralogy.basalt_relief_hoe": "Basalto Alivio de azada", - "block.mineralogy.basalt_relief_horizontal": "Basalto Alivio horizontal", - "block.mineralogy.basalt_relief_i": "Basalto I alivio", - "block.mineralogy.basalt_relief_left": "Basalto Alivio izquierdo", - "block.mineralogy.basalt_relief_pickaxe": "Basalto Alivio de pico", - "block.mineralogy.basalt_relief_plus": "Basalto Más alivio", - "block.mineralogy.basalt_relief_right": "Basalto Alivio correcto", - "block.mineralogy.basalt_relief_sword": "Basalto Alivio de espada", - "block.mineralogy.basalt_relief_vertical": "Basalto Alivio vertical", - "block.mineralogy.diorite_relief_axe": "Diorita Alivio del hacha", - "block.mineralogy.diorite_relief_blank": "Diorita Alivio en blanco", - "block.mineralogy.diorite_relief_cross": "Diorita Alivio cruzado", - "block.mineralogy.diorite_relief_hammer": "Diorita Alivio del martillo", - "block.mineralogy.diorite_relief_hoe": "Diorita Alivio de azada", - "block.mineralogy.diorite_relief_horizontal": "Diorita Alivio horizontal", - "block.mineralogy.diorite_relief_i": "Diorita I alivio", - "block.mineralogy.diorite_relief_left": "Diorita Alivio izquierdo", - "block.mineralogy.diorite_relief_pickaxe": "Diorita Alivio de pico", - "block.mineralogy.diorite_relief_plus": "Diorita Más alivio", - "block.mineralogy.diorite_relief_right": "Diorita Alivio correcto", - "block.mineralogy.diorite_relief_sword": "Diorita Alivio de espada", - "block.mineralogy.diorite_relief_vertical": "Diorita Alivio vertical", - "block.mineralogy.granite_relief_axe": "Granito Alivio del hacha", - "block.mineralogy.granite_relief_blank": "Granito Alivio en blanco", - "block.mineralogy.granite_relief_cross": "Granito Alivio cruzado", - "block.mineralogy.granite_relief_hammer": "Granito Alivio del martillo", - "block.mineralogy.granite_relief_hoe": "Granito Alivio de azada", - "block.mineralogy.granite_relief_horizontal": "Granito Alivio horizontal", - "block.mineralogy.granite_relief_i": "Granito I alivio", - "block.mineralogy.granite_relief_left": "Granito Alivio izquierdo", - "block.mineralogy.granite_relief_pickaxe": "Granito Alivio de pico", - "block.mineralogy.granite_relief_plus": "Granito Más alivio", - "block.mineralogy.granite_relief_right": "Granito Alivio correcto", - "block.mineralogy.granite_relief_sword": "Granito Alivio de espada", - "block.mineralogy.granite_relief_vertical": "Granito Alivio vertical", - "block.mineralogy.rhyolite_relief_axe": "Riolita Alivio del hacha", - "block.mineralogy.rhyolite_relief_blank": "Riolita Alivio en blanco", - "block.mineralogy.rhyolite_relief_cross": "Riolita Alivio cruzado", - "block.mineralogy.rhyolite_relief_hammer": "Riolita Alivio del martillo", - "block.mineralogy.rhyolite_relief_hoe": "Riolita Alivio de azada", - "block.mineralogy.rhyolite_relief_horizontal": "Riolita Alivio horizontal", - "block.mineralogy.rhyolite_relief_i": "Riolita I alivio", - "block.mineralogy.rhyolite_relief_left": "Riolita Alivio izquierdo", - "block.mineralogy.rhyolite_relief_pickaxe": "Riolita Alivio de pico", - "block.mineralogy.rhyolite_relief_plus": "Riolita Más alivio", - "block.mineralogy.rhyolite_relief_right": "Riolita Alivio correcto", - "block.mineralogy.rhyolite_relief_sword": "Riolita Alivio de espada", - "block.mineralogy.rhyolite_relief_vertical": "Riolita Alivio vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatita Alivio del hacha", - "block.mineralogy.pegmatite_relief_blank": "Pegmatita Alivio en blanco", - "block.mineralogy.pegmatite_relief_cross": "Pegmatita Alivio cruzado", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatita Alivio del martillo", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatita Alivio de azada", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatita Alivio horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatita I alivio", - "block.mineralogy.pegmatite_relief_left": "Pegmatita Alivio izquierdo", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatita Alivio de pico", - "block.mineralogy.pegmatite_relief_plus": "Pegmatita Más alivio", - "block.mineralogy.pegmatite_relief_right": "Pegmatita Alivio correcto", - "block.mineralogy.pegmatite_relief_sword": "Pegmatita Alivio de espada", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatita Alivio vertical", - "block.mineralogy.shale_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.shale_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.shale_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.shale_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.shale_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.shale_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.shale_relief_i": "Esquisto I alivio", - "block.mineralogy.shale_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.shale_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.shale_relief_plus": "Esquisto Más alivio", - "block.mineralogy.shale_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.shale_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.shale_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomerado Alivio del hacha", - "block.mineralogy.conglomerate_relief_blank": "Conglomerado Alivio en blanco", - "block.mineralogy.conglomerate_relief_cross": "Conglomerado Alivio cruzado", - "block.mineralogy.conglomerate_relief_hammer": "Conglomerado Alivio del martillo", - "block.mineralogy.conglomerate_relief_hoe": "Conglomerado Alivio de azada", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomerado Alivio horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomerado I alivio", - "block.mineralogy.conglomerate_relief_left": "Conglomerado Alivio izquierdo", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomerado Alivio de pico", - "block.mineralogy.conglomerate_relief_plus": "Conglomerado Más alivio", - "block.mineralogy.conglomerate_relief_right": "Conglomerado Alivio correcto", - "block.mineralogy.conglomerate_relief_sword": "Conglomerado Alivio de espada", - "block.mineralogy.conglomerate_relief_vertical": "Conglomerado Alivio vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomita Alivio del hacha", - "block.mineralogy.dolomite_relief_blank": "Dolomita Alivio en blanco", - "block.mineralogy.dolomite_relief_cross": "Dolomita Alivio cruzado", - "block.mineralogy.dolomite_relief_hammer": "Dolomita Alivio del martillo", - "block.mineralogy.dolomite_relief_hoe": "Dolomita Alivio de azada", - "block.mineralogy.dolomite_relief_horizontal": "Dolomita Alivio horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomita I alivio", - "block.mineralogy.dolomite_relief_left": "Dolomita Alivio izquierdo", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomita Alivio de pico", - "block.mineralogy.dolomite_relief_plus": "Dolomita Más alivio", - "block.mineralogy.dolomite_relief_right": "Dolomita Alivio correcto", - "block.mineralogy.dolomite_relief_sword": "Dolomita Alivio de espada", - "block.mineralogy.dolomite_relief_vertical": "Dolomita Alivio vertical", - "block.mineralogy.limestone_relief_axe": "Caliza Alivio del hacha", - "block.mineralogy.limestone_relief_blank": "Caliza Alivio en blanco", - "block.mineralogy.limestone_relief_cross": "Caliza Alivio cruzado", - "block.mineralogy.limestone_relief_hammer": "Caliza Alivio del martillo", - "block.mineralogy.limestone_relief_hoe": "Caliza Alivio de azada", - "block.mineralogy.limestone_relief_horizontal": "Caliza Alivio horizontal", - "block.mineralogy.limestone_relief_i": "Caliza I alivio", - "block.mineralogy.limestone_relief_left": "Caliza Alivio izquierdo", - "block.mineralogy.limestone_relief_pickaxe": "Caliza Alivio de pico", - "block.mineralogy.limestone_relief_plus": "Caliza Más alivio", - "block.mineralogy.limestone_relief_right": "Caliza Alivio correcto", - "block.mineralogy.limestone_relief_sword": "Caliza Alivio de espada", - "block.mineralogy.limestone_relief_vertical": "Caliza Alivio vertical", - "block.mineralogy.marble_relief_axe": "Mármol Alivio del hacha", - "block.mineralogy.marble_relief_blank": "Mármol Alivio en blanco", - "block.mineralogy.marble_relief_cross": "Mármol Alivio cruzado", - "block.mineralogy.marble_relief_hammer": "Mármol Alivio del martillo", - "block.mineralogy.marble_relief_hoe": "Mármol Alivio de azada", - "block.mineralogy.marble_relief_horizontal": "Mármol Alivio horizontal", - "block.mineralogy.marble_relief_i": "Mármol I alivio", - "block.mineralogy.marble_relief_left": "Mármol Alivio izquierdo", - "block.mineralogy.marble_relief_pickaxe": "Mármol Alivio de pico", - "block.mineralogy.marble_relief_plus": "Mármol Más alivio", - "block.mineralogy.marble_relief_right": "Mármol Alivio correcto", - "block.mineralogy.marble_relief_sword": "Mármol Alivio de espada", - "block.mineralogy.marble_relief_vertical": "Mármol Alivio vertical", - "block.mineralogy.slate_relief_axe": "Pizarra Alivio del hacha", - "block.mineralogy.slate_relief_blank": "Pizarra Alivio en blanco", - "block.mineralogy.slate_relief_cross": "Pizarra Alivio cruzado", - "block.mineralogy.slate_relief_hammer": "Pizarra Alivio del martillo", - "block.mineralogy.slate_relief_hoe": "Pizarra Alivio de azada", - "block.mineralogy.slate_relief_horizontal": "Pizarra Alivio horizontal", - "block.mineralogy.slate_relief_i": "Pizarra I alivio", - "block.mineralogy.slate_relief_left": "Pizarra Alivio izquierdo", - "block.mineralogy.slate_relief_pickaxe": "Pizarra Alivio de pico", - "block.mineralogy.slate_relief_plus": "Pizarra Más alivio", - "block.mineralogy.slate_relief_right": "Pizarra Alivio correcto", - "block.mineralogy.slate_relief_sword": "Pizarra Alivio de espada", - "block.mineralogy.slate_relief_vertical": "Pizarra Alivio vertical", - "block.mineralogy.schist_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.schist_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.schist_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.schist_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.schist_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.schist_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.schist_relief_i": "Esquisto I alivio", - "block.mineralogy.schist_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.schist_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.schist_relief_plus": "Esquisto Más alivio", - "block.mineralogy.schist_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.schist_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.schist_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.gneiss_relief_axe": "Gneis Alivio del hacha", - "block.mineralogy.gneiss_relief_blank": "Gneis Alivio en blanco", - "block.mineralogy.gneiss_relief_cross": "Gneis Alivio cruzado", - "block.mineralogy.gneiss_relief_hammer": "Gneis Alivio del martillo", - "block.mineralogy.gneiss_relief_hoe": "Gneis Alivio de azada", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Alivio horizontal", - "block.mineralogy.gneiss_relief_i": "Gneis I alivio", - "block.mineralogy.gneiss_relief_left": "Gneis Alivio izquierdo", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Alivio de pico", - "block.mineralogy.gneiss_relief_plus": "Gneis Más alivio", - "block.mineralogy.gneiss_relief_right": "Gneis Alivio correcto", - "block.mineralogy.gneiss_relief_sword": "Gneis Alivio de espada", - "block.mineralogy.gneiss_relief_vertical": "Gneis Alivio vertical", - "block.mineralogy.phyllite_relief_axe": "Filita Alivio del hacha", - "block.mineralogy.phyllite_relief_blank": "Filita Alivio en blanco", - "block.mineralogy.phyllite_relief_cross": "Filita Alivio cruzado", - "block.mineralogy.phyllite_relief_hammer": "Filita Alivio del martillo", - "block.mineralogy.phyllite_relief_hoe": "Filita Alivio de azada", - "block.mineralogy.phyllite_relief_horizontal": "Filita Alivio horizontal", - "block.mineralogy.phyllite_relief_i": "Filita I alivio", - "block.mineralogy.phyllite_relief_left": "Filita Alivio izquierdo", - "block.mineralogy.phyllite_relief_pickaxe": "Filita Alivio de pico", - "block.mineralogy.phyllite_relief_plus": "Filita Más alivio", - "block.mineralogy.phyllite_relief_right": "Filita Alivio correcto", - "block.mineralogy.phyllite_relief_sword": "Filita Alivio de espada", - "block.mineralogy.phyllite_relief_vertical": "Filita Alivio vertical", - "block.mineralogy.amphibolite_relief_axe": "Anfibolita Alivio del hacha", - "block.mineralogy.amphibolite_relief_blank": "Anfibolita Alivio en blanco", - "block.mineralogy.amphibolite_relief_cross": "Anfibolita Alivio cruzado", - "block.mineralogy.amphibolite_relief_hammer": "Anfibolita Alivio del martillo", - "block.mineralogy.amphibolite_relief_hoe": "Anfibolita Alivio de azada", - "block.mineralogy.amphibolite_relief_horizontal": "Anfibolita Alivio horizontal", - "block.mineralogy.amphibolite_relief_i": "Anfibolita I alivio", - "block.mineralogy.amphibolite_relief_left": "Anfibolita Alivio izquierdo", - "block.mineralogy.amphibolite_relief_pickaxe": "Anfibolita Alivio de pico", - "block.mineralogy.amphibolite_relief_plus": "Anfibolita Más alivio", - "block.mineralogy.amphibolite_relief_right": "Anfibolita Alivio correcto", - "block.mineralogy.amphibolite_relief_sword": "Anfibolita Alivio de espada", - "block.mineralogy.amphibolite_relief_vertical": "Anfibolita Alivio vertical", - "block.mineralogy.diabase_relief_axe": "Diabasa Alivio del hacha", - "block.mineralogy.diabase_relief_blank": "Diabasa Alivio en blanco", - "block.mineralogy.diabase_relief_cross": "Diabasa Alivio cruzado", - "block.mineralogy.diabase_relief_hammer": "Diabasa Alivio del martillo", - "block.mineralogy.diabase_relief_hoe": "Diabasa Alivio de azada", - "block.mineralogy.diabase_relief_horizontal": "Diabasa Alivio horizontal", - "block.mineralogy.diabase_relief_i": "Diabasa I alivio", - "block.mineralogy.diabase_relief_left": "Diabasa Alivio izquierdo", - "block.mineralogy.diabase_relief_pickaxe": "Diabasa Alivio de pico", - "block.mineralogy.diabase_relief_plus": "Diabasa Más alivio", - "block.mineralogy.diabase_relief_right": "Diabasa Alivio correcto", - "block.mineralogy.diabase_relief_sword": "Diabasa Alivio de espada", - "block.mineralogy.diabase_relief_vertical": "Diabasa Alivio vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Alivio del hacha", - "block.mineralogy.gabbro_relief_blank": "Gabbro Alivio en blanco", - "block.mineralogy.gabbro_relief_cross": "Gabbro Alivio cruzado", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Alivio del martillo", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Alivio de azada", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Alivio horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I alivio", - "block.mineralogy.gabbro_relief_left": "Gabbro Alivio izquierdo", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Alivio de pico", - "block.mineralogy.gabbro_relief_plus": "Gabbro Más alivio", - "block.mineralogy.gabbro_relief_right": "Gabbro Alivio correcto", - "block.mineralogy.gabbro_relief_sword": "Gabbro Alivio de espada", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Alivio vertical", - "block.mineralogy.peridotite_relief_axe": "Peridotita Alivio del hacha", - "block.mineralogy.peridotite_relief_blank": "Peridotita Alivio en blanco", - "block.mineralogy.peridotite_relief_cross": "Peridotita Alivio cruzado", - "block.mineralogy.peridotite_relief_hammer": "Peridotita Alivio del martillo", - "block.mineralogy.peridotite_relief_hoe": "Peridotita Alivio de azada", - "block.mineralogy.peridotite_relief_horizontal": "Peridotita Alivio horizontal", - "block.mineralogy.peridotite_relief_i": "Peridotita I alivio", - "block.mineralogy.peridotite_relief_left": "Peridotita Alivio izquierdo", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotita Alivio de pico", - "block.mineralogy.peridotite_relief_plus": "Peridotita Más alivio", - "block.mineralogy.peridotite_relief_right": "Peridotita Alivio correcto", - "block.mineralogy.peridotite_relief_sword": "Peridotita Alivio de espada", - "block.mineralogy.peridotite_relief_vertical": "Peridotita Alivio vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Vidrio basaltoico Alivio del hacha", - "block.mineralogy.basaltic_glass_relief_blank": "Vidrio basaltoico Alivio en blanco", - "block.mineralogy.basaltic_glass_relief_cross": "Vidrio basaltoico Alivio cruzado", - "block.mineralogy.basaltic_glass_relief_hammer": "Vidrio basaltoico Alivio del martillo", - "block.mineralogy.basaltic_glass_relief_hoe": "Vidrio basaltoico Alivio de azada", - "block.mineralogy.basaltic_glass_relief_horizontal": "Vidrio basaltoico Alivio horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Vidrio basaltoico I alivio", - "block.mineralogy.basaltic_glass_relief_left": "Vidrio basaltoico Alivio izquierdo", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Vidrio basaltoico Alivio de pico", - "block.mineralogy.basaltic_glass_relief_plus": "Vidrio basaltoico Más alivio", - "block.mineralogy.basaltic_glass_relief_right": "Vidrio basaltoico Alivio correcto", - "block.mineralogy.basaltic_glass_relief_sword": "Vidrio basaltoico Alivio de espada", - "block.mineralogy.basaltic_glass_relief_vertical": "Vidrio basaltoico Alivio vertical", - "block.mineralogy.scoria_relief_axe": "Escoria Alivio del hacha", - "block.mineralogy.scoria_relief_blank": "Escoria Alivio en blanco", - "block.mineralogy.scoria_relief_cross": "Escoria Alivio cruzado", - "block.mineralogy.scoria_relief_hammer": "Escoria Alivio del martillo", - "block.mineralogy.scoria_relief_hoe": "Escoria Alivio de azada", - "block.mineralogy.scoria_relief_horizontal": "Escoria Alivio horizontal", - "block.mineralogy.scoria_relief_i": "Escoria I alivio", - "block.mineralogy.scoria_relief_left": "Escoria Alivio izquierdo", - "block.mineralogy.scoria_relief_pickaxe": "Escoria Alivio de pico", - "block.mineralogy.scoria_relief_plus": "Escoria Más alivio", - "block.mineralogy.scoria_relief_right": "Escoria Alivio correcto", - "block.mineralogy.scoria_relief_sword": "Escoria Alivio de espada", - "block.mineralogy.scoria_relief_vertical": "Escoria Alivio vertical", - "block.mineralogy.tuff_relief_axe": "Toba Alivio del hacha", - "block.mineralogy.tuff_relief_blank": "Toba Alivio en blanco", - "block.mineralogy.tuff_relief_cross": "Toba Alivio cruzado", - "block.mineralogy.tuff_relief_hammer": "Toba Alivio del martillo", - "block.mineralogy.tuff_relief_hoe": "Toba Alivio de azada", - "block.mineralogy.tuff_relief_horizontal": "Toba Alivio horizontal", - "block.mineralogy.tuff_relief_i": "Toba I alivio", - "block.mineralogy.tuff_relief_left": "Toba Alivio izquierdo", - "block.mineralogy.tuff_relief_pickaxe": "Toba Alivio de pico", - "block.mineralogy.tuff_relief_plus": "Toba Más alivio", - "block.mineralogy.tuff_relief_right": "Toba Alivio correcto", - "block.mineralogy.tuff_relief_sword": "Toba Alivio de espada", - "block.mineralogy.tuff_relief_vertical": "Toba Alivio vertical", - "block.mineralogy.siltstone_relief_axe": "Siltstone Alivio del hacha", - "block.mineralogy.siltstone_relief_blank": "Siltstone Alivio en blanco", - "block.mineralogy.siltstone_relief_cross": "Siltstone Alivio cruzado", - "block.mineralogy.siltstone_relief_hammer": "Siltstone Alivio del martillo", - "block.mineralogy.siltstone_relief_hoe": "Siltstone Alivio de azada", - "block.mineralogy.siltstone_relief_horizontal": "Siltstone Alivio horizontal", - "block.mineralogy.siltstone_relief_i": "Siltstone I alivio", - "block.mineralogy.siltstone_relief_left": "Siltstone Alivio izquierdo", - "block.mineralogy.siltstone_relief_pickaxe": "Siltstone Alivio de pico", - "block.mineralogy.siltstone_relief_plus": "Siltstone Más alivio", - "block.mineralogy.siltstone_relief_right": "Siltstone Alivio correcto", - "block.mineralogy.siltstone_relief_sword": "Siltstone Alivio de espada", - "block.mineralogy.siltstone_relief_vertical": "Siltstone Alivio vertical", - "block.mineralogy.rock_salt_relief_axe": "Sal de roca Alivio del hacha", - "block.mineralogy.rock_salt_relief_blank": "Sal de roca Alivio en blanco", - "block.mineralogy.rock_salt_relief_cross": "Sal de roca Alivio cruzado", - "block.mineralogy.rock_salt_relief_hammer": "Sal de roca Alivio del martillo", - "block.mineralogy.rock_salt_relief_hoe": "Sal de roca Alivio de azada", - "block.mineralogy.rock_salt_relief_horizontal": "Sal de roca Alivio horizontal", - "block.mineralogy.rock_salt_relief_i": "Sal de roca I alivio", - "block.mineralogy.rock_salt_relief_left": "Sal de roca Alivio izquierdo", - "block.mineralogy.rock_salt_relief_pickaxe": "Sal de roca Alivio de pico", - "block.mineralogy.rock_salt_relief_plus": "Sal de roca Más alivio", - "block.mineralogy.rock_salt_relief_right": "Sal de roca Alivio correcto", - "block.mineralogy.rock_salt_relief_sword": "Sal de roca Alivio de espada", - "block.mineralogy.rock_salt_relief_vertical": "Sal de roca Alivio vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Alivio del hacha", - "block.mineralogy.hornfels_relief_blank": "Hornfels Alivio en blanco", - "block.mineralogy.hornfels_relief_cross": "Hornfels Alivio cruzado", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Alivio del martillo", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Alivio de azada", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Alivio horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I alivio", - "block.mineralogy.hornfels_relief_left": "Hornfels Alivio izquierdo", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Alivio de pico", - "block.mineralogy.hornfels_relief_plus": "Hornfels Más alivio", - "block.mineralogy.hornfels_relief_right": "Hornfels Alivio correcto", - "block.mineralogy.hornfels_relief_sword": "Hornfels Alivio de espada", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Alivio vertical", - "block.mineralogy.quartzite_relief_axe": "Cuarcita Alivio del hacha", - "block.mineralogy.quartzite_relief_blank": "Cuarcita Alivio en blanco", - "block.mineralogy.quartzite_relief_cross": "Cuarcita Alivio cruzado", - "block.mineralogy.quartzite_relief_hammer": "Cuarcita Alivio del martillo", - "block.mineralogy.quartzite_relief_hoe": "Cuarcita Alivio de azada", - "block.mineralogy.quartzite_relief_horizontal": "Cuarcita Alivio horizontal", - "block.mineralogy.quartzite_relief_i": "Cuarcita I alivio", - "block.mineralogy.quartzite_relief_left": "Cuarcita Alivio izquierdo", - "block.mineralogy.quartzite_relief_pickaxe": "Cuarcita Alivio de pico", - "block.mineralogy.quartzite_relief_plus": "Cuarcita Más alivio", - "block.mineralogy.quartzite_relief_right": "Cuarcita Alivio correcto", - "block.mineralogy.quartzite_relief_sword": "Cuarcita Alivio de espada", - "block.mineralogy.quartzite_relief_vertical": "Cuarcita Alivio vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculita Alivio del hacha", - "block.mineralogy.novaculite_relief_blank": "Novaculita Alivio en blanco", - "block.mineralogy.novaculite_relief_cross": "Novaculita Alivio cruzado", - "block.mineralogy.novaculite_relief_hammer": "Novaculita Alivio del martillo", - "block.mineralogy.novaculite_relief_hoe": "Novaculita Alivio de azada", - "block.mineralogy.novaculite_relief_horizontal": "Novaculita Alivio horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculita I alivio", - "block.mineralogy.novaculite_relief_left": "Novaculita Alivio izquierdo", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculita Alivio de pico", - "block.mineralogy.novaculite_relief_plus": "Novaculita Más alivio", - "block.mineralogy.novaculite_relief_right": "Novaculita Alivio correcto", - "block.mineralogy.novaculite_relief_sword": "Novaculita Alivio de espada", - "block.mineralogy.novaculite_relief_vertical": "Novaculita Alivio vertical", - "advancements.mineralogy.all_the_rocks.title": "¡Llama a las rocas Ludo!", - "advancements.mineralogy.all_the_rocks.description": "¡Vaya, has encontrado todos los tipos de rocas estándar en Mineralogía!", - "fluid.mineralogy.crude_oil": "Petróleo Crudo", - "block.mineralogy.crude_oil": "Petróleo Crudo", - "item.mineralogy.crude_oil_bucket": "Balde de petróleo crudo", + "block.mineralogy.andesite_relief_axe": "Relieve de Andesita (hacha)", + "block.mineralogy.andesite_relief_blank": "Relieve de Andesita (sin motivo)", + "block.mineralogy.andesite_relief_cross": "Relieve de Andesita (cruz)", + "block.mineralogy.andesite_relief_hammer": "Relieve de Andesita (martillo)", + "block.mineralogy.andesite_relief_hoe": "Relieve de Andesita (azada)", + "block.mineralogy.andesite_relief_horizontal": "Relieve de Andesita (horizontal)", + "block.mineralogy.andesite_relief_i": "Relieve de Andesita (I)", + "block.mineralogy.andesite_relief_left": "Relieve de Andesita (izquierda)", + "block.mineralogy.andesite_relief_pickaxe": "Relieve de Andesita (pico)", + "block.mineralogy.andesite_relief_plus": "Relieve de Andesita (signo más)", + "block.mineralogy.andesite_relief_right": "Relieve de Andesita (derecha)", + "block.mineralogy.andesite_relief_sword": "Relieve de Andesita (espada)", + "block.mineralogy.andesite_relief_vertical": "Relieve de Andesita (vertical)", + "block.mineralogy.basalt_relief_axe": "Relieve de Basalto (hacha)", + "block.mineralogy.basalt_relief_blank": "Relieve de Basalto (sin motivo)", + "block.mineralogy.basalt_relief_cross": "Relieve de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Relieve de Basalto (martillo)", + "block.mineralogy.basalt_relief_hoe": "Relieve de Basalto (azada)", + "block.mineralogy.basalt_relief_horizontal": "Relieve de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Relieve de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Relieve de Basalto (izquierda)", + "block.mineralogy.basalt_relief_pickaxe": "Relieve de Basalto (pico)", + "block.mineralogy.basalt_relief_plus": "Relieve de Basalto (signo más)", + "block.mineralogy.basalt_relief_right": "Relieve de Basalto (derecha)", + "block.mineralogy.basalt_relief_sword": "Relieve de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Relieve de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Relieve de Diorita (hacha)", + "block.mineralogy.diorite_relief_blank": "Relieve de Diorita (sin motivo)", + "block.mineralogy.diorite_relief_cross": "Relieve de Diorita (cruz)", + "block.mineralogy.diorite_relief_hammer": "Relieve de Diorita (martillo)", + "block.mineralogy.diorite_relief_hoe": "Relieve de Diorita (azada)", + "block.mineralogy.diorite_relief_horizontal": "Relieve de Diorita (horizontal)", + "block.mineralogy.diorite_relief_i": "Relieve de Diorita (I)", + "block.mineralogy.diorite_relief_left": "Relieve de Diorita (izquierda)", + "block.mineralogy.diorite_relief_pickaxe": "Relieve de Diorita (pico)", + "block.mineralogy.diorite_relief_plus": "Relieve de Diorita (signo más)", + "block.mineralogy.diorite_relief_right": "Relieve de Diorita (derecha)", + "block.mineralogy.diorite_relief_sword": "Relieve de Diorita (espada)", + "block.mineralogy.diorite_relief_vertical": "Relieve de Diorita (vertical)", + "block.mineralogy.granite_relief_axe": "Relieve de Granito (hacha)", + "block.mineralogy.granite_relief_blank": "Relieve de Granito (sin motivo)", + "block.mineralogy.granite_relief_cross": "Relieve de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Relieve de Granito (martillo)", + "block.mineralogy.granite_relief_hoe": "Relieve de Granito (azada)", + "block.mineralogy.granite_relief_horizontal": "Relieve de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Relieve de Granito (I)", + "block.mineralogy.granite_relief_left": "Relieve de Granito (izquierda)", + "block.mineralogy.granite_relief_pickaxe": "Relieve de Granito (pico)", + "block.mineralogy.granite_relief_plus": "Relieve de Granito (signo más)", + "block.mineralogy.granite_relief_right": "Relieve de Granito (derecha)", + "block.mineralogy.granite_relief_sword": "Relieve de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Relieve de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Relieve de Riolita (hacha)", + "block.mineralogy.rhyolite_relief_blank": "Relieve de Riolita (sin motivo)", + "block.mineralogy.rhyolite_relief_cross": "Relieve de Riolita (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Relieve de Riolita (martillo)", + "block.mineralogy.rhyolite_relief_hoe": "Relieve de Riolita (azada)", + "block.mineralogy.rhyolite_relief_horizontal": "Relieve de Riolita (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Relieve de Riolita (I)", + "block.mineralogy.rhyolite_relief_left": "Relieve de Riolita (izquierda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relieve de Riolita (pico)", + "block.mineralogy.rhyolite_relief_plus": "Relieve de Riolita (signo más)", + "block.mineralogy.rhyolite_relief_right": "Relieve de Riolita (derecha)", + "block.mineralogy.rhyolite_relief_sword": "Relieve de Riolita (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Relieve de Riolita (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Relieve de Pegmatita (hacha)", + "block.mineralogy.pegmatite_relief_blank": "Relieve de Pegmatita (sin motivo)", + "block.mineralogy.pegmatite_relief_cross": "Relieve de Pegmatita (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Relieve de Pegmatita (martillo)", + "block.mineralogy.pegmatite_relief_hoe": "Relieve de Pegmatita (azada)", + "block.mineralogy.pegmatite_relief_horizontal": "Relieve de Pegmatita (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Relieve de Pegmatita (I)", + "block.mineralogy.pegmatite_relief_left": "Relieve de Pegmatita (izquierda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relieve de Pegmatita (pico)", + "block.mineralogy.pegmatite_relief_plus": "Relieve de Pegmatita (signo más)", + "block.mineralogy.pegmatite_relief_right": "Relieve de Pegmatita (derecha)", + "block.mineralogy.pegmatite_relief_sword": "Relieve de Pegmatita (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Relieve de Pegmatita (vertical)", + "block.mineralogy.shale_relief_axe": "Relieve de Lutita (hacha)", + "block.mineralogy.shale_relief_blank": "Relieve de Lutita (sin motivo)", + "block.mineralogy.shale_relief_cross": "Relieve de Lutita (cruz)", + "block.mineralogy.shale_relief_hammer": "Relieve de Lutita (martillo)", + "block.mineralogy.shale_relief_hoe": "Relieve de Lutita (azada)", + "block.mineralogy.shale_relief_horizontal": "Relieve de Lutita (horizontal)", + "block.mineralogy.shale_relief_i": "Relieve de Lutita (I)", + "block.mineralogy.shale_relief_left": "Relieve de Lutita (izquierda)", + "block.mineralogy.shale_relief_pickaxe": "Relieve de Lutita (pico)", + "block.mineralogy.shale_relief_plus": "Relieve de Lutita (signo más)", + "block.mineralogy.shale_relief_right": "Relieve de Lutita (derecha)", + "block.mineralogy.shale_relief_sword": "Relieve de Lutita (espada)", + "block.mineralogy.shale_relief_vertical": "Relieve de Lutita (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Relieve de Conglomerado (hacha)", + "block.mineralogy.conglomerate_relief_blank": "Relieve de Conglomerado (sin motivo)", + "block.mineralogy.conglomerate_relief_cross": "Relieve de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Relieve de Conglomerado (martillo)", + "block.mineralogy.conglomerate_relief_hoe": "Relieve de Conglomerado (azada)", + "block.mineralogy.conglomerate_relief_horizontal": "Relieve de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Relieve de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Relieve de Conglomerado (izquierda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relieve de Conglomerado (pico)", + "block.mineralogy.conglomerate_relief_plus": "Relieve de Conglomerado (signo más)", + "block.mineralogy.conglomerate_relief_right": "Relieve de Conglomerado (derecha)", + "block.mineralogy.conglomerate_relief_sword": "Relieve de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Relieve de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Relieve de Dolomita (hacha)", + "block.mineralogy.dolomite_relief_blank": "Relieve de Dolomita (sin motivo)", + "block.mineralogy.dolomite_relief_cross": "Relieve de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Relieve de Dolomita (martillo)", + "block.mineralogy.dolomite_relief_hoe": "Relieve de Dolomita (azada)", + "block.mineralogy.dolomite_relief_horizontal": "Relieve de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Relieve de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Relieve de Dolomita (izquierda)", + "block.mineralogy.dolomite_relief_pickaxe": "Relieve de Dolomita (pico)", + "block.mineralogy.dolomite_relief_plus": "Relieve de Dolomita (signo más)", + "block.mineralogy.dolomite_relief_right": "Relieve de Dolomita (derecha)", + "block.mineralogy.dolomite_relief_sword": "Relieve de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Relieve de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Relieve de Caliza (hacha)", + "block.mineralogy.limestone_relief_blank": "Relieve de Caliza (sin motivo)", + "block.mineralogy.limestone_relief_cross": "Relieve de Caliza (cruz)", + "block.mineralogy.limestone_relief_hammer": "Relieve de Caliza (martillo)", + "block.mineralogy.limestone_relief_hoe": "Relieve de Caliza (azada)", + "block.mineralogy.limestone_relief_horizontal": "Relieve de Caliza (horizontal)", + "block.mineralogy.limestone_relief_i": "Relieve de Caliza (I)", + "block.mineralogy.limestone_relief_left": "Relieve de Caliza (izquierda)", + "block.mineralogy.limestone_relief_pickaxe": "Relieve de Caliza (pico)", + "block.mineralogy.limestone_relief_plus": "Relieve de Caliza (signo más)", + "block.mineralogy.limestone_relief_right": "Relieve de Caliza (derecha)", + "block.mineralogy.limestone_relief_sword": "Relieve de Caliza (espada)", + "block.mineralogy.limestone_relief_vertical": "Relieve de Caliza (vertical)", + "block.mineralogy.marble_relief_axe": "Relieve de Mármol (hacha)", + "block.mineralogy.marble_relief_blank": "Relieve de Mármol (sin motivo)", + "block.mineralogy.marble_relief_cross": "Relieve de Mármol (cruz)", + "block.mineralogy.marble_relief_hammer": "Relieve de Mármol (martillo)", + "block.mineralogy.marble_relief_hoe": "Relieve de Mármol (azada)", + "block.mineralogy.marble_relief_horizontal": "Relieve de Mármol (horizontal)", + "block.mineralogy.marble_relief_i": "Relieve de Mármol (I)", + "block.mineralogy.marble_relief_left": "Relieve de Mármol (izquierda)", + "block.mineralogy.marble_relief_pickaxe": "Relieve de Mármol (pico)", + "block.mineralogy.marble_relief_plus": "Relieve de Mármol (signo más)", + "block.mineralogy.marble_relief_right": "Relieve de Mármol (derecha)", + "block.mineralogy.marble_relief_sword": "Relieve de Mármol (espada)", + "block.mineralogy.marble_relief_vertical": "Relieve de Mármol (vertical)", + "block.mineralogy.slate_relief_axe": "Relieve de Pizarra (hacha)", + "block.mineralogy.slate_relief_blank": "Relieve de Pizarra (sin motivo)", + "block.mineralogy.slate_relief_cross": "Relieve de Pizarra (cruz)", + "block.mineralogy.slate_relief_hammer": "Relieve de Pizarra (martillo)", + "block.mineralogy.slate_relief_hoe": "Relieve de Pizarra (azada)", + "block.mineralogy.slate_relief_horizontal": "Relieve de Pizarra (horizontal)", + "block.mineralogy.slate_relief_i": "Relieve de Pizarra (I)", + "block.mineralogy.slate_relief_left": "Relieve de Pizarra (izquierda)", + "block.mineralogy.slate_relief_pickaxe": "Relieve de Pizarra (pico)", + "block.mineralogy.slate_relief_plus": "Relieve de Pizarra (signo más)", + "block.mineralogy.slate_relief_right": "Relieve de Pizarra (derecha)", + "block.mineralogy.slate_relief_sword": "Relieve de Pizarra (espada)", + "block.mineralogy.slate_relief_vertical": "Relieve de Pizarra (vertical)", + "block.mineralogy.schist_relief_axe": "Relieve de Esquisto (hacha)", + "block.mineralogy.schist_relief_blank": "Relieve de Esquisto (sin motivo)", + "block.mineralogy.schist_relief_cross": "Relieve de Esquisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Relieve de Esquisto (martillo)", + "block.mineralogy.schist_relief_hoe": "Relieve de Esquisto (azada)", + "block.mineralogy.schist_relief_horizontal": "Relieve de Esquisto (horizontal)", + "block.mineralogy.schist_relief_i": "Relieve de Esquisto (I)", + "block.mineralogy.schist_relief_left": "Relieve de Esquisto (izquierda)", + "block.mineralogy.schist_relief_pickaxe": "Relieve de Esquisto (pico)", + "block.mineralogy.schist_relief_plus": "Relieve de Esquisto (signo más)", + "block.mineralogy.schist_relief_right": "Relieve de Esquisto (derecha)", + "block.mineralogy.schist_relief_sword": "Relieve de Esquisto (espada)", + "block.mineralogy.schist_relief_vertical": "Relieve de Esquisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Relieve de Gneis (hacha)", + "block.mineralogy.gneiss_relief_blank": "Relieve de Gneis (sin motivo)", + "block.mineralogy.gneiss_relief_cross": "Relieve de Gneis (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Relieve de Gneis (martillo)", + "block.mineralogy.gneiss_relief_hoe": "Relieve de Gneis (azada)", + "block.mineralogy.gneiss_relief_horizontal": "Relieve de Gneis (horizontal)", + "block.mineralogy.gneiss_relief_i": "Relieve de Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relieve de Gneis (izquierda)", + "block.mineralogy.gneiss_relief_pickaxe": "Relieve de Gneis (pico)", + "block.mineralogy.gneiss_relief_plus": "Relieve de Gneis (signo más)", + "block.mineralogy.gneiss_relief_right": "Relieve de Gneis (derecha)", + "block.mineralogy.gneiss_relief_sword": "Relieve de Gneis (espada)", + "block.mineralogy.gneiss_relief_vertical": "Relieve de Gneis (vertical)", + "block.mineralogy.phyllite_relief_axe": "Relieve de Filita (hacha)", + "block.mineralogy.phyllite_relief_blank": "Relieve de Filita (sin motivo)", + "block.mineralogy.phyllite_relief_cross": "Relieve de Filita (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Relieve de Filita (martillo)", + "block.mineralogy.phyllite_relief_hoe": "Relieve de Filita (azada)", + "block.mineralogy.phyllite_relief_horizontal": "Relieve de Filita (horizontal)", + "block.mineralogy.phyllite_relief_i": "Relieve de Filita (I)", + "block.mineralogy.phyllite_relief_left": "Relieve de Filita (izquierda)", + "block.mineralogy.phyllite_relief_pickaxe": "Relieve de Filita (pico)", + "block.mineralogy.phyllite_relief_plus": "Relieve de Filita (signo más)", + "block.mineralogy.phyllite_relief_right": "Relieve de Filita (derecha)", + "block.mineralogy.phyllite_relief_sword": "Relieve de Filita (espada)", + "block.mineralogy.phyllite_relief_vertical": "Relieve de Filita (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Relieve de Anfibolita (hacha)", + "block.mineralogy.amphibolite_relief_blank": "Relieve de Anfibolita (sin motivo)", + "block.mineralogy.amphibolite_relief_cross": "Relieve de Anfibolita (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Relieve de Anfibolita (martillo)", + "block.mineralogy.amphibolite_relief_hoe": "Relieve de Anfibolita (azada)", + "block.mineralogy.amphibolite_relief_horizontal": "Relieve de Anfibolita (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Relieve de Anfibolita (I)", + "block.mineralogy.amphibolite_relief_left": "Relieve de Anfibolita (izquierda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relieve de Anfibolita (pico)", + "block.mineralogy.amphibolite_relief_plus": "Relieve de Anfibolita (signo más)", + "block.mineralogy.amphibolite_relief_right": "Relieve de Anfibolita (derecha)", + "block.mineralogy.amphibolite_relief_sword": "Relieve de Anfibolita (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Relieve de Anfibolita (vertical)", + "block.mineralogy.diabase_relief_axe": "Relieve de Diabasa (hacha)", + "block.mineralogy.diabase_relief_blank": "Relieve de Diabasa (sin motivo)", + "block.mineralogy.diabase_relief_cross": "Relieve de Diabasa (cruz)", + "block.mineralogy.diabase_relief_hammer": "Relieve de Diabasa (martillo)", + "block.mineralogy.diabase_relief_hoe": "Relieve de Diabasa (azada)", + "block.mineralogy.diabase_relief_horizontal": "Relieve de Diabasa (horizontal)", + "block.mineralogy.diabase_relief_i": "Relieve de Diabasa (I)", + "block.mineralogy.diabase_relief_left": "Relieve de Diabasa (izquierda)", + "block.mineralogy.diabase_relief_pickaxe": "Relieve de Diabasa (pico)", + "block.mineralogy.diabase_relief_plus": "Relieve de Diabasa (signo más)", + "block.mineralogy.diabase_relief_right": "Relieve de Diabasa (derecha)", + "block.mineralogy.diabase_relief_sword": "Relieve de Diabasa (espada)", + "block.mineralogy.diabase_relief_vertical": "Relieve de Diabasa (vertical)", + "block.mineralogy.gabbro_relief_axe": "Relieve de Gabro (hacha)", + "block.mineralogy.gabbro_relief_blank": "Relieve de Gabro (sin motivo)", + "block.mineralogy.gabbro_relief_cross": "Relieve de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Relieve de Gabro (martillo)", + "block.mineralogy.gabbro_relief_hoe": "Relieve de Gabro (azada)", + "block.mineralogy.gabbro_relief_horizontal": "Relieve de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Relieve de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Relieve de Gabro (izquierda)", + "block.mineralogy.gabbro_relief_pickaxe": "Relieve de Gabro (pico)", + "block.mineralogy.gabbro_relief_plus": "Relieve de Gabro (signo más)", + "block.mineralogy.gabbro_relief_right": "Relieve de Gabro (derecha)", + "block.mineralogy.gabbro_relief_sword": "Relieve de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Relieve de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Relieve de Peridotita (hacha)", + "block.mineralogy.peridotite_relief_blank": "Relieve de Peridotita (sin motivo)", + "block.mineralogy.peridotite_relief_cross": "Relieve de Peridotita (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Relieve de Peridotita (martillo)", + "block.mineralogy.peridotite_relief_hoe": "Relieve de Peridotita (azada)", + "block.mineralogy.peridotite_relief_horizontal": "Relieve de Peridotita (horizontal)", + "block.mineralogy.peridotite_relief_i": "Relieve de Peridotita (I)", + "block.mineralogy.peridotite_relief_left": "Relieve de Peridotita (izquierda)", + "block.mineralogy.peridotite_relief_pickaxe": "Relieve de Peridotita (pico)", + "block.mineralogy.peridotite_relief_plus": "Relieve de Peridotita (signo más)", + "block.mineralogy.peridotite_relief_right": "Relieve de Peridotita (derecha)", + "block.mineralogy.peridotite_relief_sword": "Relieve de Peridotita (espada)", + "block.mineralogy.peridotite_relief_vertical": "Relieve de Peridotita (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Relieve de Vidrio basáltico (hacha)", + "block.mineralogy.basaltic_glass_relief_blank": "Relieve de Vidrio basáltico (sin motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Relieve de Vidrio basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relieve de Vidrio basáltico (martillo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relieve de Vidrio basáltico (azada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relieve de Vidrio basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Relieve de Vidrio basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relieve de Vidrio basáltico (izquierda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relieve de Vidrio basáltico (pico)", + "block.mineralogy.basaltic_glass_relief_plus": "Relieve de Vidrio basáltico (signo más)", + "block.mineralogy.basaltic_glass_relief_right": "Relieve de Vidrio basáltico (derecha)", + "block.mineralogy.basaltic_glass_relief_sword": "Relieve de Vidrio basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relieve de Vidrio basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Relieve de Escoria (hacha)", + "block.mineralogy.scoria_relief_blank": "Relieve de Escoria (sin motivo)", + "block.mineralogy.scoria_relief_cross": "Relieve de Escoria (cruz)", + "block.mineralogy.scoria_relief_hammer": "Relieve de Escoria (martillo)", + "block.mineralogy.scoria_relief_hoe": "Relieve de Escoria (azada)", + "block.mineralogy.scoria_relief_horizontal": "Relieve de Escoria (horizontal)", + "block.mineralogy.scoria_relief_i": "Relieve de Escoria (I)", + "block.mineralogy.scoria_relief_left": "Relieve de Escoria (izquierda)", + "block.mineralogy.scoria_relief_pickaxe": "Relieve de Escoria (pico)", + "block.mineralogy.scoria_relief_plus": "Relieve de Escoria (signo más)", + "block.mineralogy.scoria_relief_right": "Relieve de Escoria (derecha)", + "block.mineralogy.scoria_relief_sword": "Relieve de Escoria (espada)", + "block.mineralogy.scoria_relief_vertical": "Relieve de Escoria (vertical)", + "block.mineralogy.tuff_relief_axe": "Relieve de Toba (hacha)", + "block.mineralogy.tuff_relief_blank": "Relieve de Toba (sin motivo)", + "block.mineralogy.tuff_relief_cross": "Relieve de Toba (cruz)", + "block.mineralogy.tuff_relief_hammer": "Relieve de Toba (martillo)", + "block.mineralogy.tuff_relief_hoe": "Relieve de Toba (azada)", + "block.mineralogy.tuff_relief_horizontal": "Relieve de Toba (horizontal)", + "block.mineralogy.tuff_relief_i": "Relieve de Toba (I)", + "block.mineralogy.tuff_relief_left": "Relieve de Toba (izquierda)", + "block.mineralogy.tuff_relief_pickaxe": "Relieve de Toba (pico)", + "block.mineralogy.tuff_relief_plus": "Relieve de Toba (signo más)", + "block.mineralogy.tuff_relief_right": "Relieve de Toba (derecha)", + "block.mineralogy.tuff_relief_sword": "Relieve de Toba (espada)", + "block.mineralogy.tuff_relief_vertical": "Relieve de Toba (vertical)", + "block.mineralogy.siltstone_relief_axe": "Relieve de Limolita (hacha)", + "block.mineralogy.siltstone_relief_blank": "Relieve de Limolita (sin motivo)", + "block.mineralogy.siltstone_relief_cross": "Relieve de Limolita (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Relieve de Limolita (martillo)", + "block.mineralogy.siltstone_relief_hoe": "Relieve de Limolita (azada)", + "block.mineralogy.siltstone_relief_horizontal": "Relieve de Limolita (horizontal)", + "block.mineralogy.siltstone_relief_i": "Relieve de Limolita (I)", + "block.mineralogy.siltstone_relief_left": "Relieve de Limolita (izquierda)", + "block.mineralogy.siltstone_relief_pickaxe": "Relieve de Limolita (pico)", + "block.mineralogy.siltstone_relief_plus": "Relieve de Limolita (signo más)", + "block.mineralogy.siltstone_relief_right": "Relieve de Limolita (derecha)", + "block.mineralogy.siltstone_relief_sword": "Relieve de Limolita (espada)", + "block.mineralogy.siltstone_relief_vertical": "Relieve de Limolita (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Relieve de Sal de roca (hacha)", + "block.mineralogy.rock_salt_relief_blank": "Relieve de Sal de roca (sin motivo)", + "block.mineralogy.rock_salt_relief_cross": "Relieve de Sal de roca (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Relieve de Sal de roca (martillo)", + "block.mineralogy.rock_salt_relief_hoe": "Relieve de Sal de roca (azada)", + "block.mineralogy.rock_salt_relief_horizontal": "Relieve de Sal de roca (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Relieve de Sal de roca (I)", + "block.mineralogy.rock_salt_relief_left": "Relieve de Sal de roca (izquierda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relieve de Sal de roca (pico)", + "block.mineralogy.rock_salt_relief_plus": "Relieve de Sal de roca (signo más)", + "block.mineralogy.rock_salt_relief_right": "Relieve de Sal de roca (derecha)", + "block.mineralogy.rock_salt_relief_sword": "Relieve de Sal de roca (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Relieve de Sal de roca (vertical)", + "block.mineralogy.hornfels_relief_axe": "Relieve de Corneana (hacha)", + "block.mineralogy.hornfels_relief_blank": "Relieve de Corneana (sin motivo)", + "block.mineralogy.hornfels_relief_cross": "Relieve de Corneana (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Relieve de Corneana (martillo)", + "block.mineralogy.hornfels_relief_hoe": "Relieve de Corneana (azada)", + "block.mineralogy.hornfels_relief_horizontal": "Relieve de Corneana (horizontal)", + "block.mineralogy.hornfels_relief_i": "Relieve de Corneana (I)", + "block.mineralogy.hornfels_relief_left": "Relieve de Corneana (izquierda)", + "block.mineralogy.hornfels_relief_pickaxe": "Relieve de Corneana (pico)", + "block.mineralogy.hornfels_relief_plus": "Relieve de Corneana (signo más)", + "block.mineralogy.hornfels_relief_right": "Relieve de Corneana (derecha)", + "block.mineralogy.hornfels_relief_sword": "Relieve de Corneana (espada)", + "block.mineralogy.hornfels_relief_vertical": "Relieve de Corneana (vertical)", + "block.mineralogy.quartzite_relief_axe": "Relieve de Cuarcita (hacha)", + "block.mineralogy.quartzite_relief_blank": "Relieve de Cuarcita (sin motivo)", + "block.mineralogy.quartzite_relief_cross": "Relieve de Cuarcita (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Relieve de Cuarcita (martillo)", + "block.mineralogy.quartzite_relief_hoe": "Relieve de Cuarcita (azada)", + "block.mineralogy.quartzite_relief_horizontal": "Relieve de Cuarcita (horizontal)", + "block.mineralogy.quartzite_relief_i": "Relieve de Cuarcita (I)", + "block.mineralogy.quartzite_relief_left": "Relieve de Cuarcita (izquierda)", + "block.mineralogy.quartzite_relief_pickaxe": "Relieve de Cuarcita (pico)", + "block.mineralogy.quartzite_relief_plus": "Relieve de Cuarcita (signo más)", + "block.mineralogy.quartzite_relief_right": "Relieve de Cuarcita (derecha)", + "block.mineralogy.quartzite_relief_sword": "Relieve de Cuarcita (espada)", + "block.mineralogy.quartzite_relief_vertical": "Relieve de Cuarcita (vertical)", + "block.mineralogy.novaculite_relief_axe": "Relieve de Novaculita (hacha)", + "block.mineralogy.novaculite_relief_blank": "Relieve de Novaculita (sin motivo)", + "block.mineralogy.novaculite_relief_cross": "Relieve de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Relieve de Novaculita (martillo)", + "block.mineralogy.novaculite_relief_hoe": "Relieve de Novaculita (azada)", + "block.mineralogy.novaculite_relief_horizontal": "Relieve de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Relieve de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Relieve de Novaculita (izquierda)", + "block.mineralogy.novaculite_relief_pickaxe": "Relieve de Novaculita (pico)", + "block.mineralogy.novaculite_relief_plus": "Relieve de Novaculita (signo más)", + "block.mineralogy.novaculite_relief_right": "Relieve de Novaculita (derecha)", + "block.mineralogy.novaculite_relief_sword": "Relieve de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Relieve de Novaculita (vertical)", "itemGroup.mineralogy.mineralogy": "Mineralogía", - "itemGroup.mineralogy.rock": "Mineralogía de rocas", + "itemGroup.mineralogy.rock": "Rocas de Mineralogía", "itemGroup.mineralogy.stair": "Escaleras de Mineralogía", "itemGroup.mineralogy.slab": "Losas de Mineralogía", "itemGroup.mineralogy.wall": "Muros de Mineralogía", - "itemGroup.mineralogy.item": "Artículos de Mineralogía" + "itemGroup.mineralogy.item": "Objetos de Mineralogía", + "block.mineralogy.crude_oil": "Petróleo crudo", + "item.mineralogy.crude_oil_bucket": "Cubo de petróleo crudo", + "fluid.mineralogy.crude_oil": "Petróleo crudo", + "advancements.mineralogy.all_the_rocks.title": "Todas las rocas", + "advancements.mineralogy.all_the_rocks.description": "¡Has encontrado todos los tipos de roca estándar de Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/es_mx.json b/src/main/resources/assets/mineralogy/lang/es_mx.json index 21923e59d..5738497f7 100644 --- a/src/main/resources/assets/mineralogy/lang/es_mx.json +++ b/src/main/resources/assets/mineralogy/lang/es_mx.json @@ -2,939 +2,939 @@ "block.mineralogy.andesite": "Andesita", "block.mineralogy.andesite_stairs": "Escaleras de Andesita", "block.mineralogy.andesite_slab": "Losa de Andesita", - "block.mineralogy.andesite_brick": "Ladrillo de Andesita", - "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillo Andesita", - "block.mineralogy.andesite_brick_slab": "Losa de ladrillo andesita", - "block.mineralogy.andesite_smooth": "Andesita Pulida", - "block.mineralogy.andesite_smooth_stairs": "Escalera de andesita pulida", + "block.mineralogy.andesite_brick": "Ladrillos de Andesita", + "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillos de Andesita", + "block.mineralogy.andesite_brick_slab": "Losa de ladrillos de Andesita", + "block.mineralogy.andesite_smooth": "Bloque pulido de Andesita", + "block.mineralogy.andesite_smooth_stairs": "Escaleras pulidas de Andesita", "block.mineralogy.andesite_smooth_slab": "Losa pulida de Andesita", - "block.mineralogy.andesite_smooth_brick": "Ladrillo de andesita pulido", - "block.mineralogy.andesite_smooth_brick_stairs": "Escalera de ladrillo anodizado pulido", - "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillo anodizado pulido", + "block.mineralogy.andesite_smooth_brick": "Ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillos pulidos de Andesita", "block.mineralogy.basalt": "Basalto", - "block.mineralogy.basalt_stairs": "Escaleras de basalto", - "block.mineralogy.basalt_slab": "Losa de basalto", - "block.mineralogy.basalt_brick": "Ladrillo de basalto", - "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillo de basalto", - "block.mineralogy.basalt_brick_slab": "Losa de ladrillo de basalto", - "block.mineralogy.basalt_smooth": "Basalto pulido", - "block.mineralogy.basalt_smooth_stairs": "Escaleras de basalto pulido", - "block.mineralogy.basalt_smooth_slab": "Losa de basalto pulida", - "block.mineralogy.basalt_smooth_brick": "Ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillo pulido de basalto", + "block.mineralogy.basalt_stairs": "Escaleras de Basalto", + "block.mineralogy.basalt_slab": "Losa de Basalto", + "block.mineralogy.basalt_brick": "Ladrillos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillos de Basalto", + "block.mineralogy.basalt_brick_slab": "Losa de ladrillos de Basalto", + "block.mineralogy.basalt_smooth": "Bloque pulido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escaleras pulidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Losa pulida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillos pulidos de Basalto", "block.mineralogy.diorite": "Diorita", "block.mineralogy.diorite_stairs": "Escaleras de Diorita", "block.mineralogy.diorite_slab": "Losa de Diorita", - "block.mineralogy.diorite_brick": "Ladrillo de Diorita", - "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillo de Diorita", - "block.mineralogy.diorite_brick_slab": "Losa de ladrillo de Diorita", - "block.mineralogy.diorite_smooth": "Diorita pulida", - "block.mineralogy.diorite_smooth_stairs": "Escaleras de Diorita pulida", - "block.mineralogy.diorite_smooth_slab": "Losa de Diorita pulida", - "block.mineralogy.diorite_smooth_brick": "Ladrillo de Diorita pulido", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillo de Diorita pulida", - "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillo de Diorita pulida", + "block.mineralogy.diorite_brick": "Ladrillos de Diorita", + "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillos de Diorita", + "block.mineralogy.diorite_brick_slab": "Losa de ladrillos de Diorita", + "block.mineralogy.diorite_smooth": "Bloque pulido de Diorita", + "block.mineralogy.diorite_smooth_stairs": "Escaleras pulidas de Diorita", + "block.mineralogy.diorite_smooth_slab": "Losa pulida de Diorita", + "block.mineralogy.diorite_smooth_brick": "Ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillos pulidos de Diorita", "block.mineralogy.granite": "Granito", "block.mineralogy.granite_stairs": "Escaleras de Granito", "block.mineralogy.granite_slab": "Losa de Granito", - "block.mineralogy.granite_brick": "Ladrillo de Granito", - "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillo de Granito", - "block.mineralogy.granite_brick_slab": "Losa de ladrillo de Granito", - "block.mineralogy.granite_smooth": "Granito pulida", - "block.mineralogy.granite_smooth_stairs": "Escaleras de Granito pulida", - "block.mineralogy.granite_smooth_slab": "Losa de Granito pulida", - "block.mineralogy.granite_smooth_brick": "Ladrillo de Granito pulido", - "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillo de Granito pulida", - "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillo de Granito pulida", + "block.mineralogy.granite_brick": "Ladrillos de Granito", + "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillos de Granito", + "block.mineralogy.granite_brick_slab": "Losa de ladrillos de Granito", + "block.mineralogy.granite_smooth": "Bloque pulido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escaleras pulidas de Granito", + "block.mineralogy.granite_smooth_slab": "Losa pulida de Granito", + "block.mineralogy.granite_smooth_brick": "Ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillos pulidos de Granito", "block.mineralogy.rhyolite": "Riolita", "block.mineralogy.rhyolite_stairs": "Escaleras de Riolita", "block.mineralogy.rhyolite_slab": "Losa de Riolita", - "block.mineralogy.rhyolite_brick": "Ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillo de Riolita", - "block.mineralogy.rhyolite_smooth": "Riolita pulida", - "block.mineralogy.rhyolite_smooth_stairs": "Escaleras de Riolita pulida", - "block.mineralogy.rhyolite_smooth_slab": "Losa de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick": "Ladrillo de Riolita pulido", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillo de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillo de Riolita pulida", + "block.mineralogy.rhyolite_brick": "Ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth": "Bloque pulido de Riolita", + "block.mineralogy.rhyolite_smooth_stairs": "Escaleras pulidas de Riolita", + "block.mineralogy.rhyolite_smooth_slab": "Losa pulida de Riolita", + "block.mineralogy.rhyolite_smooth_brick": "Ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite": "Pegmatita", "block.mineralogy.pegmatite_stairs": "Escaleras de Pegmatita", "block.mineralogy.pegmatite_slab": "Losa de Pegmatita", - "block.mineralogy.pegmatite_brick": "Ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_smooth": "Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_stairs": "Escaleras de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_slab": "Losa de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick": "Ladrillo de Pegmatita pulido", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillo de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillo de Pegmatita pulida", - "block.mineralogy.shale": "Esquisto", - "block.mineralogy.shale_stairs": "Escaleras de Esquisto", - "block.mineralogy.shale_slab": "Losa de Esquisto", - "block.mineralogy.shale_brick": "Ladrillo de Esquisto", - "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.shale_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.shale_smooth": "Esquisto pulida", - "block.mineralogy.shale_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.shale_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.shale_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.pegmatite_brick": "Ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth": "Bloque pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_stairs": "Escaleras pulidas de Pegmatita", + "block.mineralogy.pegmatite_smooth_slab": "Losa pulida de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick": "Ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale": "Lutita", + "block.mineralogy.shale_stairs": "Escaleras de Lutita", + "block.mineralogy.shale_slab": "Losa de Lutita", + "block.mineralogy.shale_brick": "Ladrillos de Lutita", + "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillos de Lutita", + "block.mineralogy.shale_brick_slab": "Losa de ladrillos de Lutita", + "block.mineralogy.shale_smooth": "Bloque pulido de Lutita", + "block.mineralogy.shale_smooth_stairs": "Escaleras pulidas de Lutita", + "block.mineralogy.shale_smooth_slab": "Losa pulida de Lutita", + "block.mineralogy.shale_smooth_brick": "Ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillos pulidos de Lutita", "block.mineralogy.conglomerate": "Conglomerado", "block.mineralogy.conglomerate_stairs": "Escaleras de Conglomerado", "block.mineralogy.conglomerate_slab": "Losa de Conglomerado", - "block.mineralogy.conglomerate_brick": "Ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_smooth": "Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_stairs": "Escaleras de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_slab": "Losa de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick": "Ladrillo de Conglomerado pulido", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillo de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillo de Conglomerado pulida", + "block.mineralogy.conglomerate_brick": "Ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloque pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escaleras pulidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Losa pulida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite": "Dolomita", "block.mineralogy.dolomite_stairs": "Escaleras de Dolomita", "block.mineralogy.dolomite_slab": "Losa de Dolomita", - "block.mineralogy.dolomite_brick": "Ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_slab": "Losa de ladrillo de Dolomita", - "block.mineralogy.dolomite_smooth": "Dolomita pulida", - "block.mineralogy.dolomite_smooth_stairs": "Escaleras de Dolomita pulida", - "block.mineralogy.dolomite_smooth_slab": "Losa de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick": "Ladrillo de Dolomita pulido", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillo de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillo de Dolomita pulida", + "block.mineralogy.dolomite_brick": "Ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Losa de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloque pulido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escaleras pulidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Losa pulida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillos pulidos de Dolomita", "block.mineralogy.limestone": "Caliza", "block.mineralogy.limestone_stairs": "Escaleras de Caliza", "block.mineralogy.limestone_slab": "Losa de Caliza", - "block.mineralogy.limestone_brick": "Ladrillo de Caliza", - "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillo de Caliza", - "block.mineralogy.limestone_brick_slab": "Losa de ladrillo de Caliza", - "block.mineralogy.limestone_smooth": "Caliza pulida", - "block.mineralogy.limestone_smooth_stairs": "Escaleras de Caliza pulida", - "block.mineralogy.limestone_smooth_slab": "Losa de Caliza pulida", - "block.mineralogy.limestone_smooth_brick": "Ladrillo de Caliza pulido", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillo de Caliza pulida", - "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillo de Caliza pulida", + "block.mineralogy.limestone_brick": "Ladrillos de Caliza", + "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillos de Caliza", + "block.mineralogy.limestone_brick_slab": "Losa de ladrillos de Caliza", + "block.mineralogy.limestone_smooth": "Bloque pulido de Caliza", + "block.mineralogy.limestone_smooth_stairs": "Escaleras pulidas de Caliza", + "block.mineralogy.limestone_smooth_slab": "Losa pulida de Caliza", + "block.mineralogy.limestone_smooth_brick": "Ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillos pulidos de Caliza", "block.mineralogy.slate": "Pizarra", "block.mineralogy.slate_stairs": "Escaleras de Pizarra", "block.mineralogy.slate_slab": "Losa de Pizarra", - "block.mineralogy.slate_brick": "Ladrillo de Pizarra", - "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillo de Pizarra", - "block.mineralogy.slate_brick_slab": "Losa de ladrillo de Pizarra", - "block.mineralogy.slate_smooth": "Pizarra pulida", - "block.mineralogy.slate_smooth_stairs": "Escaleras de Pizarra pulida", - "block.mineralogy.slate_smooth_slab": "Losa de Pizarra pulida", - "block.mineralogy.slate_smooth_brick": "Ladrillo de Pizarra pulido", - "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillo de Pizarra pulida", - "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillo de Pizarra pulida", + "block.mineralogy.slate_brick": "Ladrillos de Pizarra", + "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillos de Pizarra", + "block.mineralogy.slate_brick_slab": "Losa de ladrillos de Pizarra", + "block.mineralogy.slate_smooth": "Bloque pulido de Pizarra", + "block.mineralogy.slate_smooth_stairs": "Escaleras pulidas de Pizarra", + "block.mineralogy.slate_smooth_slab": "Losa pulida de Pizarra", + "block.mineralogy.slate_smooth_brick": "Ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillos pulidos de Pizarra", "block.mineralogy.schist": "Esquisto", "block.mineralogy.schist_stairs": "Escaleras de Esquisto", "block.mineralogy.schist_slab": "Losa de Esquisto", - "block.mineralogy.schist_brick": "Ladrillo de Esquisto", - "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.schist_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.schist_smooth": "Esquisto pulida", - "block.mineralogy.schist_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.schist_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.schist_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.schist_brick": "Ladrillos de Esquisto", + "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillos de Esquisto", + "block.mineralogy.schist_brick_slab": "Losa de ladrillos de Esquisto", + "block.mineralogy.schist_smooth": "Bloque pulido de Esquisto", + "block.mineralogy.schist_smooth_stairs": "Escaleras pulidas de Esquisto", + "block.mineralogy.schist_smooth_slab": "Losa pulida de Esquisto", + "block.mineralogy.schist_smooth_brick": "Ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillos pulidos de Esquisto", "block.mineralogy.gneiss": "Gneis", "block.mineralogy.gneiss_stairs": "Escaleras de Gneis", "block.mineralogy.gneiss_slab": "Losa de Gneis", - "block.mineralogy.gneiss_brick": "Ladrillo de Gneis", - "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillo de Gneis", - "block.mineralogy.gneiss_brick_slab": "Losa de ladrillo de Gneis", - "block.mineralogy.gneiss_smooth": "Gneis pulida", - "block.mineralogy.gneiss_smooth_stairs": "Escaleras de Gneis pulida", - "block.mineralogy.gneiss_smooth_slab": "Losa de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick": "Ladrillo de Gneis pulido", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillo de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillo de Gneis pulida", + "block.mineralogy.gneiss_brick": "Ladrillos de Gneis", + "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillos de Gneis", + "block.mineralogy.gneiss_brick_slab": "Losa de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth": "Bloque pulido de Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Escaleras pulidas de Gneis", + "block.mineralogy.gneiss_smooth_slab": "Losa pulida de Gneis", + "block.mineralogy.gneiss_smooth_brick": "Ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillos pulidos de Gneis", "block.mineralogy.marble": "Mármol", "block.mineralogy.marble_stairs": "Escaleras de Mármol", "block.mineralogy.marble_slab": "Losa de Mármol", - "block.mineralogy.marble_brick": "Ladrillo de Mármol", - "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillo de Mármol", - "block.mineralogy.marble_brick_slab": "Losa de ladrillo de Mármol", - "block.mineralogy.marble_smooth": "Mármol pulida", - "block.mineralogy.marble_smooth_stairs": "Escaleras de Mármol pulida", - "block.mineralogy.marble_smooth_slab": "Losa de Mármol pulida", - "block.mineralogy.marble_smooth_brick": "Ladrillo de Mármol pulido", - "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillo de Mármol pulida", - "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillo de Mármol pulida", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaleras de Phyllite", - "block.mineralogy.phyllite_slab": "Losa de Phyllite", - "block.mineralogy.phyllite_brick": "Ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_slab": "Losa de ladrillo de Phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite pulida", - "block.mineralogy.phyllite_smooth_stairs": "Escaleras de Phyllite pulida", - "block.mineralogy.phyllite_smooth_slab": "Losa de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick": "Ladrillo de Phyllite pulido", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillo de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillo de Phyllite pulida", - "block.mineralogy.amphibolite": "Amphibolita", - "block.mineralogy.amphibolite_stairs": "Escaleras de Amphibolita", - "block.mineralogy.amphibolite_slab": "Losa de Amphibolita", - "block.mineralogy.amphibolite_brick": "Ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_smooth": "Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_stairs": "Escaleras de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_slab": "Losa de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick": "Ladrillo de Amphibolita pulido", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillo de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillo de Amphibolita pulida", + "block.mineralogy.marble_brick": "Ladrillos de Mármol", + "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillos de Mármol", + "block.mineralogy.marble_brick_slab": "Losa de ladrillos de Mármol", + "block.mineralogy.marble_smooth": "Bloque pulido de Mármol", + "block.mineralogy.marble_smooth_stairs": "Escaleras pulidas de Mármol", + "block.mineralogy.marble_smooth_slab": "Losa pulida de Mármol", + "block.mineralogy.marble_smooth_brick": "Ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillos pulidos de Mármol", + "block.mineralogy.phyllite": "Filita", + "block.mineralogy.phyllite_stairs": "Escaleras de Filita", + "block.mineralogy.phyllite_slab": "Losa de Filita", + "block.mineralogy.phyllite_brick": "Ladrillos de Filita", + "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillos de Filita", + "block.mineralogy.phyllite_brick_slab": "Losa de ladrillos de Filita", + "block.mineralogy.phyllite_smooth": "Bloque pulido de Filita", + "block.mineralogy.phyllite_smooth_stairs": "Escaleras pulidas de Filita", + "block.mineralogy.phyllite_smooth_slab": "Losa pulida de Filita", + "block.mineralogy.phyllite_smooth_brick": "Ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite": "Anfibolita", + "block.mineralogy.amphibolite_stairs": "Escaleras de Anfibolita", + "block.mineralogy.amphibolite_slab": "Losa de Anfibolita", + "block.mineralogy.amphibolite_brick": "Ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth": "Bloque pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_stairs": "Escaleras pulidas de Anfibolita", + "block.mineralogy.amphibolite_smooth_slab": "Losa pulida de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick": "Ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillos pulidos de Anfibolita", "item.mineralogy.gypsum_dust": "Polvo de yeso", "item.mineralogy.sulfur_dust": "Polvo de azufre", "item.mineralogy.phosphorous_dust": "Polvo de fósforo", "item.mineralogy.nitrate_dust": "Polvo de nitrato", "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", - "block.mineralogy.chert": "Esquisto", + "block.mineralogy.chert": "Sílex", "block.mineralogy.gypsum": "Yeso", - "block.mineralogy.pumice": "Piedra Pómez", + "block.mineralogy.pumice": "Piedra pómez", "block.mineralogy.sulfur_block": "Azufre", - "block.mineralogy.sulfur_ore": "Mineral de azufre", + "block.mineralogy.sulfur_ore": "Mena de azufre", "block.mineralogy.phosphorous_block": "Fósforo", - "block.mineralogy.phosphorous_ore": "Mineral de fósforo", + "block.mineralogy.phosphorous_ore": "Mena de fósforo", "block.mineralogy.nitrate_block": "Nitrato", - "block.mineralogy.nitrate_ore": "Mineral de nitrato", - "block.mineralogy.drywall_black": "Negro panel de yeso", - "block.mineralogy.drywall_red": "Rojo panel de yeso", - "block.mineralogy.drywall_green": "Verde panel de yeso", - "block.mineralogy.drywall_brown": "Marrón panel de yeso", - "block.mineralogy.drywall_blue": "Azul panel de yeso", - "block.mineralogy.drywall_purple": "Púrpura panel de yeso", - "block.mineralogy.drywall_cyan": "Cyan panel de yeso", - "block.mineralogy.drywall_silver": "Plata panel de yeso", - "block.mineralogy.drywall_gray": "Gris panel de yeso", - "block.mineralogy.drywall_pink": "Rosado panel de yeso", - "block.mineralogy.drywall_lime": "Lima panel de yeso", - "block.mineralogy.drywall_yellow": "Amarillo panel de yeso", - "block.mineralogy.drywall_light_blue": "Azul claro panel de yeso", - "block.mineralogy.drywall_magenta": "Magenta panel de yeso", - "block.mineralogy.drywall_orange": "Naranja panel de yeso", - "block.mineralogy.drywall_white": "Blanco panel de yeso", - "block.mineralogy.andesite_wall": "Pared de andesita", - "block.mineralogy.andesite_brick_wall": "Pared de ladrillo de andesita", - "block.mineralogy.andesite_smooth_wall": "Pared Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_wall": "Pared de ladrillo pulido Andesite", - "block.mineralogy.basalt_wall": "Pared de basalto", - "block.mineralogy.basalt_brick_wall": "Pared de ladrillo de basalto", - "block.mineralogy.basalt_smooth_wall": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_wall": "Pared de ladrillo pulido de basalto", - "block.mineralogy.diorite_wall": "Pared de Diorita", - "block.mineralogy.diorite_brick_wall": "Pared de ladrillo de diorita", - "block.mineralogy.diorite_smooth_wall": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_wall": "Pared de ladrillo pulido de diorita", - "block.mineralogy.granite_wall": "Pared de granito", - "block.mineralogy.granite_brick_wall": "Pared de ladrillo de granito", - "block.mineralogy.granite_smooth_wall": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_wall": "Pared de ladrillo pulido de granito", - "block.mineralogy.rhyolite_wall": "Pared de riolita", - "block.mineralogy.rhyolite_brick_wall": "Pared de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_wall": "Pared pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_wall": "Pared de ladrillo pulido de riolita", - "block.mineralogy.pegmatite_wall": "Pared de Pegmatita", - "block.mineralogy.pegmatite_brick_wall": "Pared de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_wall": "Pared pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pared de ladrillo pulido de pegmatita", - "block.mineralogy.shale_wall": "Muro de pizarra", - "block.mineralogy.shale_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.shale_smooth_wall": "Pared pulida de pizarra", - "block.mineralogy.shale_smooth_brick_wall": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_wall": "Pared de conglomerado", - "block.mineralogy.conglomerate_brick_wall": "Pared de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_wall": "Pared pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerado, pulido, pared de ladrillo", + "block.mineralogy.nitrate_ore": "Mena de nitrato", + "block.mineralogy.drywall_black": "Panel de yeso negro", + "block.mineralogy.drywall_red": "Panel de yeso rojo", + "block.mineralogy.drywall_green": "Panel de yeso verde", + "block.mineralogy.drywall_brown": "Panel de yeso marrón", + "block.mineralogy.drywall_blue": "Panel de yeso azul", + "block.mineralogy.drywall_purple": "Panel de yeso morado", + "block.mineralogy.drywall_cyan": "Panel de yeso cian", + "block.mineralogy.drywall_silver": "Panel de yeso gris claro", + "block.mineralogy.drywall_gray": "Panel de yeso gris", + "block.mineralogy.drywall_pink": "Panel de yeso rosa", + "block.mineralogy.drywall_lime": "Panel de yeso verde lima", + "block.mineralogy.drywall_yellow": "Panel de yeso amarillo", + "block.mineralogy.drywall_light_blue": "Panel de yeso azul claro", + "block.mineralogy.drywall_magenta": "Panel de yeso magenta", + "block.mineralogy.drywall_orange": "Panel de yeso naranja", + "block.mineralogy.drywall_white": "Panel de yeso blanco", + "block.mineralogy.andesite_wall": "Muro de Andesita", + "block.mineralogy.andesite_brick_wall": "Muro de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_wall": "Muro pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de ladrillos pulidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorita", + "block.mineralogy.diorite_brick_wall": "Muro de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_wall": "Muro pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de ladrillos pulidos de Diorita", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de ladrillos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro pulido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolita", + "block.mineralogy.rhyolite_brick_wall": "Muro de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_wall": "Muro pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de ladrillos pulidos de Riolita", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatita", + "block.mineralogy.pegmatite_brick_wall": "Muro de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_wall": "Muro pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_wall": "Muro de Lutita", + "block.mineralogy.shale_brick_wall": "Muro de ladrillos de Lutita", + "block.mineralogy.shale_smooth_wall": "Muro pulido de Lutita", + "block.mineralogy.shale_smooth_brick_wall": "Muro de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite_wall": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_wall": "Pared de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_wall": "Pared pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_wall": "Pared de ladrillo pulido de dolomita", - "block.mineralogy.limestone_wall": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_wall": "Pared de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_wall": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_wall": "Pared de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_wall": "Muro de mármol", - "block.mineralogy.marble_brick_wall": "Pared de ladrillo de mármol", - "block.mineralogy.marble_smooth_wall": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_wall": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_wall": "Pared de pizarra", - "block.mineralogy.slate_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.slate_smooth_wall": "Pared pulida pizarra", - "block.mineralogy.slate_smooth_brick_wall": "Pared de ladrillo pulido pizarra", - "block.mineralogy.schist_wall": "Muro de esquisto", - "block.mineralogy.schist_brick_wall": "Pared de ladrillo esquist", - "block.mineralogy.schist_smooth_wall": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_wall": "Pared de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_wall": "Muro de gneis", - "block.mineralogy.gneiss_brick_wall": "Pared de ladrillo gneis", - "block.mineralogy.gneiss_smooth_wall": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_wall": "Pared de Phyllite", - "block.mineralogy.phyllite_brick_wall": "Pared de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_wall": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_wall": "Pared de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_wall": "Pared de anfibolita", - "block.mineralogy.amphibolite_brick_wall": "Pared de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_wall": "Pared pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_wall": "Pared de ladrillo pulido de anfibolita", - "block.mineralogy.andesite_furnace": "Horno de andesita", - "block.mineralogy.andesite_brick_furnace": "Horno de ladrillo de andesita", - "block.mineralogy.andesite_smooth_furnace": "Horno Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillo pulido Andesite", - "block.mineralogy.basalt_furnace": "Horno de basalto", - "block.mineralogy.basalt_brick_furnace": "Horno de ladrillo de basalto", - "block.mineralogy.basalt_smooth_furnace": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillo pulido de basalto", + "block.mineralogy.dolomite_brick_wall": "Muro de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Caliza", + "block.mineralogy.limestone_brick_wall": "Muro de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_wall": "Muro pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de ladrillos pulidos de Caliza", + "block.mineralogy.marble_wall": "Muro de Mármol", + "block.mineralogy.marble_brick_wall": "Muro de ladrillos de Mármol", + "block.mineralogy.marble_smooth_wall": "Muro pulido de Mármol", + "block.mineralogy.marble_smooth_brick_wall": "Muro de ladrillos pulidos de Mármol", + "block.mineralogy.slate_wall": "Muro de Pizarra", + "block.mineralogy.slate_brick_wall": "Muro de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_wall": "Muro pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_wall": "Muro de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_wall": "Muro de Esquisto", + "block.mineralogy.schist_brick_wall": "Muro de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_wall": "Muro pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_wall": "Muro de Gneis", + "block.mineralogy.gneiss_brick_wall": "Muro de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_wall": "Muro pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_wall": "Muro de Filita", + "block.mineralogy.phyllite_brick_wall": "Muro de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_wall": "Muro pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolita", + "block.mineralogy.amphibolite_brick_wall": "Muro de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_wall": "Muro pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de ladrillos pulidos de Anfibolita", + "block.mineralogy.andesite_furnace": "Horno de Andesita", + "block.mineralogy.andesite_brick_furnace": "Horno de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_furnace": "Horno pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_furnace": "Horno de Basalto", + "block.mineralogy.basalt_brick_furnace": "Horno de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Horno pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillos pulidos de Basalto", "block.mineralogy.diorite_furnace": "Horno de Diorita", - "block.mineralogy.diorite_brick_furnace": "Horno de ladrillo de diorita", - "block.mineralogy.diorite_smooth_furnace": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillo pulido de diorita", - "block.mineralogy.granite_furnace": "Horno de granito", - "block.mineralogy.granite_brick_furnace": "Horno de ladrillo de granito", - "block.mineralogy.granite_smooth_furnace": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillo pulido de granito", - "block.mineralogy.rhyolite_furnace": "Horno de riolita", - "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_furnace": "Horno pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillo pulido de riolita", + "block.mineralogy.diorite_brick_furnace": "Horno de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_furnace": "Horno pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillos pulidos de Diorita", + "block.mineralogy.granite_furnace": "Horno de Granito", + "block.mineralogy.granite_brick_furnace": "Horno de ladrillos de Granito", + "block.mineralogy.granite_smooth_furnace": "Horno pulido de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_furnace": "Horno de Riolita", + "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_furnace": "Horno pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite_furnace": "Horno de Pegmatita", - "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_furnace": "Horno pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillo pulido de pegmatita", - "block.mineralogy.shale_furnace": "Muro de pizarra", - "block.mineralogy.shale_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.shale_smooth_furnace": "Horno pulida de pizarra", - "block.mineralogy.shale_smooth_brick_furnace": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_furnace": "Horno de conglomerado", - "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_furnace": "Horno pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerado, pulido, pared de ladrillo", - "block.mineralogy.dolomite_furnace": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_furnace": "Horno pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillo pulido de dolomita", - "block.mineralogy.limestone_furnace": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_furnace": "Horno de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_furnace": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_furnace": "Muro de mármol", - "block.mineralogy.marble_brick_furnace": "Horno de ladrillo de mármol", - "block.mineralogy.marble_smooth_furnace": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_furnace": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_furnace": "Horno de pizarra", - "block.mineralogy.slate_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.slate_smooth_furnace": "Horno pulida pizarra", - "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillo pulido pizarra", - "block.mineralogy.schist_furnace": "Muro de esquisto", - "block.mineralogy.schist_brick_furnace": "Horno de ladrillo esquist", - "block.mineralogy.schist_smooth_furnace": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_furnace": "Muro de gneis", - "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillo gneis", - "block.mineralogy.gneiss_smooth_furnace": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_furnace": "Horno de Phyllite", - "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_furnace": "Horno de anfibolita", - "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_furnace": "Horno pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillo pulido de anfibolita", + "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_furnace": "Horno pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_furnace": "Horno de Lutita", + "block.mineralogy.shale_brick_furnace": "Horno de ladrillos de Lutita", + "block.mineralogy.shale_smooth_furnace": "Horno pulido de Lutita", + "block.mineralogy.shale_smooth_brick_furnace": "Horno de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_furnace": "Horno de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Horno pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Horno de ladrillos pulidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Horno de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Horno pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_furnace": "Horno de Caliza", + "block.mineralogy.limestone_brick_furnace": "Horno de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_furnace": "Horno pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillos pulidos de Caliza", + "block.mineralogy.marble_furnace": "Horno de Mármol", + "block.mineralogy.marble_brick_furnace": "Horno de ladrillos de Mármol", + "block.mineralogy.marble_smooth_furnace": "Horno pulido de Mármol", + "block.mineralogy.marble_smooth_brick_furnace": "Horno de ladrillos pulidos de Mármol", + "block.mineralogy.slate_furnace": "Horno de Pizarra", + "block.mineralogy.slate_brick_furnace": "Horno de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_furnace": "Horno pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_furnace": "Horno de Esquisto", + "block.mineralogy.schist_brick_furnace": "Horno de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_furnace": "Horno pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_furnace": "Horno de Gneis", + "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Horno pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Horno de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_furnace": "Horno de Filita", + "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_furnace": "Horno pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_furnace": "Horno de Anfibolita", + "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_furnace": "Horno pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Anfibolita", "block.mineralogy.diabase": "Diabasa", - "block.mineralogy.diabase_stairs": "Diabasa Escalera", - "block.mineralogy.diabase_slab": "Diabasa Losa", - "block.mineralogy.diabase_brick": "Diabasa Ladrillo", - "block.mineralogy.diabase_brick_stairs": "Diabasa Escaleras de ladrillo", - "block.mineralogy.diabase_brick_slab": "Diabasa Losa de ladrillo", - "block.mineralogy.diabase_smooth": "Polished Diabasa", - "block.mineralogy.diabase_smooth_stairs": "Diabasa Escaleras pulidas", - "block.mineralogy.diabase_smooth_slab": "Diabasa Losa pulida", - "block.mineralogy.diabase_smooth_brick": "Diabasa Ladrillo pulido", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabasa Polished Escaleras de ladrillo", - "block.mineralogy.diabase_smooth_brick_slab": "Diabasa Polished Losa de ladrillo", - "block.mineralogy.diabase_wall": "Diabasa pared", - "block.mineralogy.diabase_brick_wall": "Diabasa Pared de ladrillo", - "block.mineralogy.diabase_smooth_wall": "Diabasa Pared pulida", - "block.mineralogy.diabase_smooth_brick_wall": "Diabasa Ladrillo pulido pared", - "block.mineralogy.diabase_furnace": "Diabasa Horno", - "block.mineralogy.diabase_brick_furnace": "Diabasa Horno de ladrillo", - "block.mineralogy.diabase_smooth_furnace": "Diabasa Horno pulido", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabasa Ladrillo pulido Horno", - "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escalera", - "block.mineralogy.gabbro_slab": "Gabbro Losa", - "block.mineralogy.gabbro_brick": "Gabbro Ladrillo", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escaleras de ladrillo", - "block.mineralogy.gabbro_brick_slab": "Gabbro Losa de ladrillo", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escaleras pulidas", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Losa pulida", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Ladrillo pulido", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polished Escaleras de ladrillo", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polished Losa de ladrillo", - "block.mineralogy.gabbro_wall": "Gabbro pared", - "block.mineralogy.gabbro_brick_wall": "Gabbro Pared de ladrillo", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Pared pulida", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Ladrillo pulido pared", - "block.mineralogy.gabbro_furnace": "Gabbro Horno", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Horno de ladrillo", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Horno pulido", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Ladrillo pulido Horno", + "block.mineralogy.diabase_stairs": "Escaleras de Diabasa", + "block.mineralogy.diabase_slab": "Losa de Diabasa", + "block.mineralogy.diabase_brick": "Ladrillos de Diabasa", + "block.mineralogy.diabase_brick_stairs": "Escaleras de ladrillos de Diabasa", + "block.mineralogy.diabase_brick_slab": "Losa de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth": "Bloque pulido de Diabasa", + "block.mineralogy.diabase_smooth_stairs": "Escaleras pulidas de Diabasa", + "block.mineralogy.diabase_smooth_slab": "Losa pulida de Diabasa", + "block.mineralogy.diabase_smooth_brick": "Ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_slab": "Losa de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_wall": "Muro de Diabasa", + "block.mineralogy.diabase_brick_wall": "Muro de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_wall": "Muro pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_furnace": "Horno de Diabasa", + "block.mineralogy.diabase_brick_furnace": "Horno de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_furnace": "Horno pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_furnace": "Horno de ladrillos pulidos de Diabasa", + "block.mineralogy.gabbro": "Gabro", + "block.mineralogy.gabbro_stairs": "Escaleras de Gabro", + "block.mineralogy.gabbro_slab": "Losa de Gabro", + "block.mineralogy.gabbro_brick": "Ladrillos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escaleras de ladrillos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Losa de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloque pulido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escaleras pulidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Losa pulida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Losa de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_furnace": "Horno de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Horno de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Horno pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Horno de ladrillos pulidos de Gabro", "block.mineralogy.peridotite": "Peridotita", - "block.mineralogy.peridotite_stairs": "Peridotita Escalera", - "block.mineralogy.peridotite_slab": "Peridotita Losa", - "block.mineralogy.peridotite_brick": "Peridotita Ladrillo", - "block.mineralogy.peridotite_brick_stairs": "Peridotita Escaleras de ladrillo", - "block.mineralogy.peridotite_brick_slab": "Peridotita Losa de ladrillo", - "block.mineralogy.peridotite_smooth": "Polished Peridotita", - "block.mineralogy.peridotite_smooth_stairs": "Peridotita Escaleras pulidas", - "block.mineralogy.peridotite_smooth_slab": "Peridotita Losa pulida", - "block.mineralogy.peridotite_smooth_brick": "Peridotita Ladrillo pulido", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotita Polished Escaleras de ladrillo", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotita Polished Losa de ladrillo", - "block.mineralogy.peridotite_wall": "Peridotita pared", - "block.mineralogy.peridotite_brick_wall": "Peridotita Pared de ladrillo", - "block.mineralogy.peridotite_smooth_wall": "Peridotita Pared pulida", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotita Ladrillo pulido pared", - "block.mineralogy.peridotite_furnace": "Peridotita Horno", - "block.mineralogy.peridotite_brick_furnace": "Peridotita Horno de ladrillo", - "block.mineralogy.peridotite_smooth_furnace": "Peridotita Horno pulido", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotita Ladrillo pulido Horno", + "block.mineralogy.peridotite_stairs": "Escaleras de Peridotita", + "block.mineralogy.peridotite_slab": "Losa de Peridotita", + "block.mineralogy.peridotite_brick": "Ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_stairs": "Escaleras de ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_slab": "Losa de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth": "Bloque pulido de Peridotita", + "block.mineralogy.peridotite_smooth_stairs": "Escaleras pulidas de Peridotita", + "block.mineralogy.peridotite_smooth_slab": "Losa pulida de Peridotita", + "block.mineralogy.peridotite_smooth_brick": "Ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_slab": "Losa de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_wall": "Muro de Peridotita", + "block.mineralogy.peridotite_brick_wall": "Muro de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_wall": "Muro pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_furnace": "Horno de Peridotita", + "block.mineralogy.peridotite_brick_furnace": "Horno de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_furnace": "Horno pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_furnace": "Horno de ladrillos pulidos de Peridotita", "block.mineralogy.basaltic_glass": "Vidrio basáltico", - "block.mineralogy.basaltic_glass_stairs": "Vidrio basáltico Escalera", - "block.mineralogy.basaltic_glass_slab": "Vidrio basáltico Losa", - "block.mineralogy.basaltic_glass_brick": "Vidrio basáltico Ladrillo", - "block.mineralogy.basaltic_glass_brick_stairs": "Vidrio basáltico Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_brick_slab": "Vidrio basáltico Losa de ladrillo", - "block.mineralogy.basaltic_glass_smooth": "Polished Vidrio basáltico", - "block.mineralogy.basaltic_glass_smooth_stairs": "Vidrio basáltico Escaleras pulidas", - "block.mineralogy.basaltic_glass_smooth_slab": "Vidrio basáltico Losa pulida", - "block.mineralogy.basaltic_glass_smooth_brick": "Vidrio basáltico Ladrillo pulido", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Vidrio basáltico Polished Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Vidrio basáltico Polished Losa de ladrillo", - "block.mineralogy.basaltic_glass_wall": "Vidrio basáltico pared", - "block.mineralogy.basaltic_glass_brick_wall": "Vidrio basáltico Pared de ladrillo", - "block.mineralogy.basaltic_glass_smooth_wall": "Vidrio basáltico Pared pulida", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Vidrio basáltico Ladrillo pulido pared", - "block.mineralogy.basaltic_glass_furnace": "Vidrio basáltico Horno", - "block.mineralogy.basaltic_glass_brick_furnace": "Vidrio basáltico Horno de ladrillo", - "block.mineralogy.basaltic_glass_smooth_furnace": "Vidrio basáltico Horno pulido", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Vidrio basáltico Ladrillo pulido Horno", + "block.mineralogy.basaltic_glass_stairs": "Escaleras de Vidrio basáltico", + "block.mineralogy.basaltic_glass_slab": "Losa de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick": "Ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escaleras de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Losa de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloque pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escaleras pulidas de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Losa pulida de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Losa de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_furnace": "Horno de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Horno de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Horno pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Horno de ladrillos pulidos de Vidrio basáltico", "block.mineralogy.scoria": "Escoria", - "block.mineralogy.scoria_stairs": "Escoria Escalera", - "block.mineralogy.scoria_slab": "Escoria Losa", - "block.mineralogy.scoria_brick": "Escoria Ladrillo", - "block.mineralogy.scoria_brick_stairs": "Escoria Escaleras de ladrillo", - "block.mineralogy.scoria_brick_slab": "Escoria Losa de ladrillo", - "block.mineralogy.scoria_smooth": "Polished Escoria", - "block.mineralogy.scoria_smooth_stairs": "Escoria Escaleras pulidas", - "block.mineralogy.scoria_smooth_slab": "Escoria Losa pulida", - "block.mineralogy.scoria_smooth_brick": "Escoria Ladrillo pulido", - "block.mineralogy.scoria_smooth_brick_stairs": "Escoria Polished Escaleras de ladrillo", - "block.mineralogy.scoria_smooth_brick_slab": "Escoria Polished Losa de ladrillo", - "block.mineralogy.scoria_wall": "Escoria pared", - "block.mineralogy.scoria_brick_wall": "Escoria Pared de ladrillo", - "block.mineralogy.scoria_smooth_wall": "Escoria Pared pulida", - "block.mineralogy.scoria_smooth_brick_wall": "Escoria Ladrillo pulido pared", - "block.mineralogy.scoria_furnace": "Escoria Horno", - "block.mineralogy.scoria_brick_furnace": "Escoria Horno de ladrillo", - "block.mineralogy.scoria_smooth_furnace": "Escoria Horno pulido", - "block.mineralogy.scoria_smooth_brick_furnace": "Escoria Ladrillo pulido Horno", + "block.mineralogy.scoria_stairs": "Escaleras de Escoria", + "block.mineralogy.scoria_slab": "Losa de Escoria", + "block.mineralogy.scoria_brick": "Ladrillos de Escoria", + "block.mineralogy.scoria_brick_stairs": "Escaleras de ladrillos de Escoria", + "block.mineralogy.scoria_brick_slab": "Losa de ladrillos de Escoria", + "block.mineralogy.scoria_smooth": "Bloque pulido de Escoria", + "block.mineralogy.scoria_smooth_stairs": "Escaleras pulidas de Escoria", + "block.mineralogy.scoria_smooth_slab": "Losa pulida de Escoria", + "block.mineralogy.scoria_smooth_brick": "Ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_slab": "Losa de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_wall": "Muro de Escoria", + "block.mineralogy.scoria_brick_wall": "Muro de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_wall": "Muro pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_furnace": "Horno de Escoria", + "block.mineralogy.scoria_brick_furnace": "Horno de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_furnace": "Horno pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Horno de ladrillos pulidos de Escoria", "block.mineralogy.tuff": "Toba", - "block.mineralogy.tuff_stairs": "Toba Escalera", - "block.mineralogy.tuff_slab": "Toba Losa", - "block.mineralogy.tuff_brick": "Toba Ladrillo", - "block.mineralogy.tuff_brick_stairs": "Toba Escaleras de ladrillo", - "block.mineralogy.tuff_brick_slab": "Toba Losa de ladrillo", - "block.mineralogy.tuff_smooth": "Polished Toba", - "block.mineralogy.tuff_smooth_stairs": "Toba Escaleras pulidas", - "block.mineralogy.tuff_smooth_slab": "Toba Losa pulida", - "block.mineralogy.tuff_smooth_brick": "Toba Ladrillo pulido", - "block.mineralogy.tuff_smooth_brick_stairs": "Toba Polished Escaleras de ladrillo", - "block.mineralogy.tuff_smooth_brick_slab": "Toba Polished Losa de ladrillo", - "block.mineralogy.tuff_wall": "Toba pared", - "block.mineralogy.tuff_brick_wall": "Toba Pared de ladrillo", - "block.mineralogy.tuff_smooth_wall": "Toba Pared pulida", - "block.mineralogy.tuff_smooth_brick_wall": "Toba Ladrillo pulido pared", - "block.mineralogy.tuff_furnace": "Toba Horno", - "block.mineralogy.tuff_brick_furnace": "Toba Horno de ladrillo", - "block.mineralogy.tuff_smooth_furnace": "Toba Horno pulido", - "block.mineralogy.tuff_smooth_brick_furnace": "Toba Ladrillo pulido Horno", - "block.mineralogy.siltstone": "Siltstone", - "block.mineralogy.siltstone_stairs": "Siltstone Escalera", - "block.mineralogy.siltstone_slab": "Siltstone Losa", - "block.mineralogy.siltstone_brick": "Siltstone Ladrillo", - "block.mineralogy.siltstone_brick_stairs": "Siltstone Escaleras de ladrillo", - "block.mineralogy.siltstone_brick_slab": "Siltstone Losa de ladrillo", - "block.mineralogy.siltstone_smooth": "Polished Siltstone", - "block.mineralogy.siltstone_smooth_stairs": "Siltstone Escaleras pulidas", - "block.mineralogy.siltstone_smooth_slab": "Siltstone Losa pulida", - "block.mineralogy.siltstone_smooth_brick": "Siltstone Ladrillo pulido", - "block.mineralogy.siltstone_smooth_brick_stairs": "Siltstone Polished Escaleras de ladrillo", - "block.mineralogy.siltstone_smooth_brick_slab": "Siltstone Polished Losa de ladrillo", - "block.mineralogy.siltstone_wall": "Siltstone pared", - "block.mineralogy.siltstone_brick_wall": "Siltstone Pared de ladrillo", - "block.mineralogy.siltstone_smooth_wall": "Siltstone Pared pulida", - "block.mineralogy.siltstone_smooth_brick_wall": "Siltstone Ladrillo pulido pared", - "block.mineralogy.siltstone_furnace": "Siltstone Horno", - "block.mineralogy.siltstone_brick_furnace": "Siltstone Horno de ladrillo", - "block.mineralogy.siltstone_smooth_furnace": "Siltstone Horno pulido", - "block.mineralogy.siltstone_smooth_brick_furnace": "Siltstone Ladrillo pulido Horno", + "block.mineralogy.tuff_stairs": "Escaleras de Toba", + "block.mineralogy.tuff_slab": "Losa de Toba", + "block.mineralogy.tuff_brick": "Ladrillos de Toba", + "block.mineralogy.tuff_brick_stairs": "Escaleras de ladrillos de Toba", + "block.mineralogy.tuff_brick_slab": "Losa de ladrillos de Toba", + "block.mineralogy.tuff_smooth": "Bloque pulido de Toba", + "block.mineralogy.tuff_smooth_stairs": "Escaleras pulidas de Toba", + "block.mineralogy.tuff_smooth_slab": "Losa pulida de Toba", + "block.mineralogy.tuff_smooth_brick": "Ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_slab": "Losa de ladrillos pulidos de Toba", + "block.mineralogy.tuff_wall": "Muro de Toba", + "block.mineralogy.tuff_brick_wall": "Muro de ladrillos de Toba", + "block.mineralogy.tuff_smooth_wall": "Muro pulido de Toba", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de ladrillos pulidos de Toba", + "block.mineralogy.tuff_furnace": "Horno de Toba", + "block.mineralogy.tuff_brick_furnace": "Horno de ladrillos de Toba", + "block.mineralogy.tuff_smooth_furnace": "Horno pulido de Toba", + "block.mineralogy.tuff_smooth_brick_furnace": "Horno de ladrillos pulidos de Toba", + "block.mineralogy.siltstone": "Limolita", + "block.mineralogy.siltstone_stairs": "Escaleras de Limolita", + "block.mineralogy.siltstone_slab": "Losa de Limolita", + "block.mineralogy.siltstone_brick": "Ladrillos de Limolita", + "block.mineralogy.siltstone_brick_stairs": "Escaleras de ladrillos de Limolita", + "block.mineralogy.siltstone_brick_slab": "Losa de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth": "Bloque pulido de Limolita", + "block.mineralogy.siltstone_smooth_stairs": "Escaleras pulidas de Limolita", + "block.mineralogy.siltstone_smooth_slab": "Losa pulida de Limolita", + "block.mineralogy.siltstone_smooth_brick": "Ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_slab": "Losa de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_wall": "Muro de Limolita", + "block.mineralogy.siltstone_brick_wall": "Muro de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_wall": "Muro pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_furnace": "Horno de Limolita", + "block.mineralogy.siltstone_brick_furnace": "Horno de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_furnace": "Horno pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_furnace": "Horno de ladrillos pulidos de Limolita", "block.mineralogy.rock_salt": "Sal de roca", - "block.mineralogy.rock_salt_stairs": "Sal de roca Escalera", - "block.mineralogy.rock_salt_slab": "Sal de roca Losa", - "block.mineralogy.rock_salt_brick": "Sal de roca Ladrillo", - "block.mineralogy.rock_salt_brick_stairs": "Sal de roca Escaleras de ladrillo", - "block.mineralogy.rock_salt_brick_slab": "Sal de roca Losa de ladrillo", - "block.mineralogy.rock_salt_smooth": "Polished Sal de roca", - "block.mineralogy.rock_salt_smooth_stairs": "Sal de roca Escaleras pulidas", - "block.mineralogy.rock_salt_smooth_slab": "Sal de roca Losa pulida", - "block.mineralogy.rock_salt_smooth_brick": "Sal de roca Ladrillo pulido", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sal de roca Polished Escaleras de ladrillo", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sal de roca Polished Losa de ladrillo", - "block.mineralogy.rock_salt_wall": "Sal de roca pared", - "block.mineralogy.rock_salt_brick_wall": "Sal de roca Pared de ladrillo", - "block.mineralogy.rock_salt_smooth_wall": "Sal de roca Pared pulida", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sal de roca Ladrillo pulido pared", - "block.mineralogy.rock_salt_furnace": "Sal de roca Horno", - "block.mineralogy.rock_salt_brick_furnace": "Sal de roca Horno de ladrillo", - "block.mineralogy.rock_salt_smooth_furnace": "Sal de roca Horno pulido", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sal de roca Ladrillo pulido Horno", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escalera", - "block.mineralogy.hornfels_slab": "Hornfels Losa", - "block.mineralogy.hornfels_brick": "Hornfels Ladrillo", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escaleras de ladrillo", - "block.mineralogy.hornfels_brick_slab": "Hornfels Losa de ladrillo", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escaleras pulidas", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Losa pulida", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Ladrillo pulido", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polished Escaleras de ladrillo", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polished Losa de ladrillo", - "block.mineralogy.hornfels_wall": "Hornfels pared", - "block.mineralogy.hornfels_brick_wall": "Hornfels Pared de ladrillo", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Pared pulida", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Ladrillo pulido pared", - "block.mineralogy.hornfels_furnace": "Hornfels Horno", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Horno de ladrillo", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Horno pulido", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Ladrillo pulido Horno", + "block.mineralogy.rock_salt_stairs": "Escaleras de Sal de roca", + "block.mineralogy.rock_salt_slab": "Losa de Sal de roca", + "block.mineralogy.rock_salt_brick": "Ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_stairs": "Escaleras de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_slab": "Losa de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth": "Bloque pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_stairs": "Escaleras pulidas de Sal de roca", + "block.mineralogy.rock_salt_smooth_slab": "Losa pulida de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick": "Ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_slab": "Losa de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_wall": "Muro de Sal de roca", + "block.mineralogy.rock_salt_brick_wall": "Muro de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_wall": "Muro pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_furnace": "Horno de Sal de roca", + "block.mineralogy.rock_salt_brick_furnace": "Horno de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_furnace": "Horno pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Horno de ladrillos pulidos de Sal de roca", + "block.mineralogy.hornfels": "Corneana", + "block.mineralogy.hornfels_stairs": "Escaleras de Corneana", + "block.mineralogy.hornfels_slab": "Losa de Corneana", + "block.mineralogy.hornfels_brick": "Ladrillos de Corneana", + "block.mineralogy.hornfels_brick_stairs": "Escaleras de ladrillos de Corneana", + "block.mineralogy.hornfels_brick_slab": "Losa de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth": "Bloque pulido de Corneana", + "block.mineralogy.hornfels_smooth_stairs": "Escaleras pulidas de Corneana", + "block.mineralogy.hornfels_smooth_slab": "Losa pulida de Corneana", + "block.mineralogy.hornfels_smooth_brick": "Ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_slab": "Losa de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_wall": "Muro de Corneana", + "block.mineralogy.hornfels_brick_wall": "Muro de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_wall": "Muro pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_furnace": "Horno de Corneana", + "block.mineralogy.hornfels_brick_furnace": "Horno de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_furnace": "Horno pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_furnace": "Horno de ladrillos pulidos de Corneana", "block.mineralogy.quartzite": "Cuarcita", - "block.mineralogy.quartzite_stairs": "Cuarcita Escalera", - "block.mineralogy.quartzite_slab": "Cuarcita Losa", - "block.mineralogy.quartzite_brick": "Cuarcita Ladrillo", - "block.mineralogy.quartzite_brick_stairs": "Cuarcita Escaleras de ladrillo", - "block.mineralogy.quartzite_brick_slab": "Cuarcita Losa de ladrillo", - "block.mineralogy.quartzite_smooth": "Polished Cuarcita", - "block.mineralogy.quartzite_smooth_stairs": "Cuarcita Escaleras pulidas", - "block.mineralogy.quartzite_smooth_slab": "Cuarcita Losa pulida", - "block.mineralogy.quartzite_smooth_brick": "Cuarcita Ladrillo pulido", - "block.mineralogy.quartzite_smooth_brick_stairs": "Cuarcita Polished Escaleras de ladrillo", - "block.mineralogy.quartzite_smooth_brick_slab": "Cuarcita Polished Losa de ladrillo", - "block.mineralogy.quartzite_wall": "Cuarcita pared", - "block.mineralogy.quartzite_brick_wall": "Cuarcita Pared de ladrillo", - "block.mineralogy.quartzite_smooth_wall": "Cuarcita Pared pulida", - "block.mineralogy.quartzite_smooth_brick_wall": "Cuarcita Ladrillo pulido pared", - "block.mineralogy.quartzite_furnace": "Cuarcita Horno", - "block.mineralogy.quartzite_brick_furnace": "Cuarcita Horno de ladrillo", - "block.mineralogy.quartzite_smooth_furnace": "Cuarcita Horno pulido", - "block.mineralogy.quartzite_smooth_brick_furnace": "Cuarcita Ladrillo pulido Horno", + "block.mineralogy.quartzite_stairs": "Escaleras de Cuarcita", + "block.mineralogy.quartzite_slab": "Losa de Cuarcita", + "block.mineralogy.quartzite_brick": "Ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_stairs": "Escaleras de ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_slab": "Losa de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth": "Bloque pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_stairs": "Escaleras pulidas de Cuarcita", + "block.mineralogy.quartzite_smooth_slab": "Losa pulida de Cuarcita", + "block.mineralogy.quartzite_smooth_brick": "Ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_slab": "Losa de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_wall": "Muro de Cuarcita", + "block.mineralogy.quartzite_brick_wall": "Muro de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_wall": "Muro pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_furnace": "Horno de Cuarcita", + "block.mineralogy.quartzite_brick_furnace": "Horno de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_furnace": "Horno pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_furnace": "Horno de ladrillos pulidos de Cuarcita", "block.mineralogy.novaculite": "Novaculita", - "block.mineralogy.novaculite_stairs": "Novaculita Escalera", - "block.mineralogy.novaculite_slab": "Novaculita Losa", - "block.mineralogy.novaculite_brick": "Novaculita Ladrillo", - "block.mineralogy.novaculite_brick_stairs": "Novaculita Escaleras de ladrillo", - "block.mineralogy.novaculite_brick_slab": "Novaculita Losa de ladrillo", - "block.mineralogy.novaculite_smooth": "Polished Novaculita", - "block.mineralogy.novaculite_smooth_stairs": "Novaculita Escaleras pulidas", - "block.mineralogy.novaculite_smooth_slab": "Novaculita Losa pulida", - "block.mineralogy.novaculite_smooth_brick": "Novaculita Ladrillo pulido", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculita Polished Escaleras de ladrillo", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculita Polished Losa de ladrillo", - "block.mineralogy.novaculite_wall": "Novaculita pared", - "block.mineralogy.novaculite_brick_wall": "Novaculita Pared de ladrillo", - "block.mineralogy.novaculite_smooth_wall": "Novaculita Pared pulida", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculita Ladrillo pulido pared", - "block.mineralogy.novaculite_furnace": "Novaculita Horno", - "block.mineralogy.novaculite_brick_furnace": "Novaculita Horno de ladrillo", - "block.mineralogy.novaculite_smooth_furnace": "Novaculita Horno pulido", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculita Ladrillo pulido Horno", + "block.mineralogy.novaculite_stairs": "Escaleras de Novaculita", + "block.mineralogy.novaculite_slab": "Losa de Novaculita", + "block.mineralogy.novaculite_brick": "Ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escaleras de ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Losa de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloque pulido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escaleras pulidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Losa pulida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Losa de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Horno de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Horno de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Horno pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Horno de ladrillos pulidos de Novaculita", "block.mineralogy.chalk": "Tiza", "item.mineralogy.chalk_dust": "Polvo de tiza", "item.mineralogy.salt_dust": "Sal", "item.mineralogy.rock_salt_dust": "Cristales de sal de roca", "block.mineralogy.rocksaltlamp": "Lámpara de sal de roca", "block.mineralogy.rocksaltstreetlamp": "Farola de sal de roca", - "block.mineralogy.andesite_relief_axe": "Andesita Alivio del hacha", - "block.mineralogy.andesite_relief_blank": "Andesita Alivio en blanco", - "block.mineralogy.andesite_relief_cross": "Andesita Alivio cruzado", - "block.mineralogy.andesite_relief_hammer": "Andesita Alivio del martillo", - "block.mineralogy.andesite_relief_hoe": "Andesita Alivio de azada", - "block.mineralogy.andesite_relief_horizontal": "Andesita Alivio horizontal", - "block.mineralogy.andesite_relief_i": "Andesita I alivio", - "block.mineralogy.andesite_relief_left": "Andesita Alivio izquierdo", - "block.mineralogy.andesite_relief_pickaxe": "Andesita Alivio de pico", - "block.mineralogy.andesite_relief_plus": "Andesita Más alivio", - "block.mineralogy.andesite_relief_right": "Andesita Alivio correcto", - "block.mineralogy.andesite_relief_sword": "Andesita Alivio de espada", - "block.mineralogy.andesite_relief_vertical": "Andesita Alivio vertical", - "block.mineralogy.basalt_relief_axe": "Basalto Alivio del hacha", - "block.mineralogy.basalt_relief_blank": "Basalto Alivio en blanco", - "block.mineralogy.basalt_relief_cross": "Basalto Alivio cruzado", - "block.mineralogy.basalt_relief_hammer": "Basalto Alivio del martillo", - "block.mineralogy.basalt_relief_hoe": "Basalto Alivio de azada", - "block.mineralogy.basalt_relief_horizontal": "Basalto Alivio horizontal", - "block.mineralogy.basalt_relief_i": "Basalto I alivio", - "block.mineralogy.basalt_relief_left": "Basalto Alivio izquierdo", - "block.mineralogy.basalt_relief_pickaxe": "Basalto Alivio de pico", - "block.mineralogy.basalt_relief_plus": "Basalto Más alivio", - "block.mineralogy.basalt_relief_right": "Basalto Alivio correcto", - "block.mineralogy.basalt_relief_sword": "Basalto Alivio de espada", - "block.mineralogy.basalt_relief_vertical": "Basalto Alivio vertical", - "block.mineralogy.diorite_relief_axe": "Diorita Alivio del hacha", - "block.mineralogy.diorite_relief_blank": "Diorita Alivio en blanco", - "block.mineralogy.diorite_relief_cross": "Diorita Alivio cruzado", - "block.mineralogy.diorite_relief_hammer": "Diorita Alivio del martillo", - "block.mineralogy.diorite_relief_hoe": "Diorita Alivio de azada", - "block.mineralogy.diorite_relief_horizontal": "Diorita Alivio horizontal", - "block.mineralogy.diorite_relief_i": "Diorita I alivio", - "block.mineralogy.diorite_relief_left": "Diorita Alivio izquierdo", - "block.mineralogy.diorite_relief_pickaxe": "Diorita Alivio de pico", - "block.mineralogy.diorite_relief_plus": "Diorita Más alivio", - "block.mineralogy.diorite_relief_right": "Diorita Alivio correcto", - "block.mineralogy.diorite_relief_sword": "Diorita Alivio de espada", - "block.mineralogy.diorite_relief_vertical": "Diorita Alivio vertical", - "block.mineralogy.granite_relief_axe": "Granito Alivio del hacha", - "block.mineralogy.granite_relief_blank": "Granito Alivio en blanco", - "block.mineralogy.granite_relief_cross": "Granito Alivio cruzado", - "block.mineralogy.granite_relief_hammer": "Granito Alivio del martillo", - "block.mineralogy.granite_relief_hoe": "Granito Alivio de azada", - "block.mineralogy.granite_relief_horizontal": "Granito Alivio horizontal", - "block.mineralogy.granite_relief_i": "Granito I alivio", - "block.mineralogy.granite_relief_left": "Granito Alivio izquierdo", - "block.mineralogy.granite_relief_pickaxe": "Granito Alivio de pico", - "block.mineralogy.granite_relief_plus": "Granito Más alivio", - "block.mineralogy.granite_relief_right": "Granito Alivio correcto", - "block.mineralogy.granite_relief_sword": "Granito Alivio de espada", - "block.mineralogy.granite_relief_vertical": "Granito Alivio vertical", - "block.mineralogy.rhyolite_relief_axe": "Riolita Alivio del hacha", - "block.mineralogy.rhyolite_relief_blank": "Riolita Alivio en blanco", - "block.mineralogy.rhyolite_relief_cross": "Riolita Alivio cruzado", - "block.mineralogy.rhyolite_relief_hammer": "Riolita Alivio del martillo", - "block.mineralogy.rhyolite_relief_hoe": "Riolita Alivio de azada", - "block.mineralogy.rhyolite_relief_horizontal": "Riolita Alivio horizontal", - "block.mineralogy.rhyolite_relief_i": "Riolita I alivio", - "block.mineralogy.rhyolite_relief_left": "Riolita Alivio izquierdo", - "block.mineralogy.rhyolite_relief_pickaxe": "Riolita Alivio de pico", - "block.mineralogy.rhyolite_relief_plus": "Riolita Más alivio", - "block.mineralogy.rhyolite_relief_right": "Riolita Alivio correcto", - "block.mineralogy.rhyolite_relief_sword": "Riolita Alivio de espada", - "block.mineralogy.rhyolite_relief_vertical": "Riolita Alivio vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatita Alivio del hacha", - "block.mineralogy.pegmatite_relief_blank": "Pegmatita Alivio en blanco", - "block.mineralogy.pegmatite_relief_cross": "Pegmatita Alivio cruzado", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatita Alivio del martillo", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatita Alivio de azada", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatita Alivio horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatita I alivio", - "block.mineralogy.pegmatite_relief_left": "Pegmatita Alivio izquierdo", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatita Alivio de pico", - "block.mineralogy.pegmatite_relief_plus": "Pegmatita Más alivio", - "block.mineralogy.pegmatite_relief_right": "Pegmatita Alivio correcto", - "block.mineralogy.pegmatite_relief_sword": "Pegmatita Alivio de espada", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatita Alivio vertical", - "block.mineralogy.shale_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.shale_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.shale_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.shale_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.shale_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.shale_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.shale_relief_i": "Esquisto I alivio", - "block.mineralogy.shale_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.shale_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.shale_relief_plus": "Esquisto Más alivio", - "block.mineralogy.shale_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.shale_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.shale_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomerado Alivio del hacha", - "block.mineralogy.conglomerate_relief_blank": "Conglomerado Alivio en blanco", - "block.mineralogy.conglomerate_relief_cross": "Conglomerado Alivio cruzado", - "block.mineralogy.conglomerate_relief_hammer": "Conglomerado Alivio del martillo", - "block.mineralogy.conglomerate_relief_hoe": "Conglomerado Alivio de azada", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomerado Alivio horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomerado I alivio", - "block.mineralogy.conglomerate_relief_left": "Conglomerado Alivio izquierdo", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomerado Alivio de pico", - "block.mineralogy.conglomerate_relief_plus": "Conglomerado Más alivio", - "block.mineralogy.conglomerate_relief_right": "Conglomerado Alivio correcto", - "block.mineralogy.conglomerate_relief_sword": "Conglomerado Alivio de espada", - "block.mineralogy.conglomerate_relief_vertical": "Conglomerado Alivio vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomita Alivio del hacha", - "block.mineralogy.dolomite_relief_blank": "Dolomita Alivio en blanco", - "block.mineralogy.dolomite_relief_cross": "Dolomita Alivio cruzado", - "block.mineralogy.dolomite_relief_hammer": "Dolomita Alivio del martillo", - "block.mineralogy.dolomite_relief_hoe": "Dolomita Alivio de azada", - "block.mineralogy.dolomite_relief_horizontal": "Dolomita Alivio horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomita I alivio", - "block.mineralogy.dolomite_relief_left": "Dolomita Alivio izquierdo", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomita Alivio de pico", - "block.mineralogy.dolomite_relief_plus": "Dolomita Más alivio", - "block.mineralogy.dolomite_relief_right": "Dolomita Alivio correcto", - "block.mineralogy.dolomite_relief_sword": "Dolomita Alivio de espada", - "block.mineralogy.dolomite_relief_vertical": "Dolomita Alivio vertical", - "block.mineralogy.limestone_relief_axe": "Caliza Alivio del hacha", - "block.mineralogy.limestone_relief_blank": "Caliza Alivio en blanco", - "block.mineralogy.limestone_relief_cross": "Caliza Alivio cruzado", - "block.mineralogy.limestone_relief_hammer": "Caliza Alivio del martillo", - "block.mineralogy.limestone_relief_hoe": "Caliza Alivio de azada", - "block.mineralogy.limestone_relief_horizontal": "Caliza Alivio horizontal", - "block.mineralogy.limestone_relief_i": "Caliza I alivio", - "block.mineralogy.limestone_relief_left": "Caliza Alivio izquierdo", - "block.mineralogy.limestone_relief_pickaxe": "Caliza Alivio de pico", - "block.mineralogy.limestone_relief_plus": "Caliza Más alivio", - "block.mineralogy.limestone_relief_right": "Caliza Alivio correcto", - "block.mineralogy.limestone_relief_sword": "Caliza Alivio de espada", - "block.mineralogy.limestone_relief_vertical": "Caliza Alivio vertical", - "block.mineralogy.marble_relief_axe": "Mármol Alivio del hacha", - "block.mineralogy.marble_relief_blank": "Mármol Alivio en blanco", - "block.mineralogy.marble_relief_cross": "Mármol Alivio cruzado", - "block.mineralogy.marble_relief_hammer": "Mármol Alivio del martillo", - "block.mineralogy.marble_relief_hoe": "Mármol Alivio de azada", - "block.mineralogy.marble_relief_horizontal": "Mármol Alivio horizontal", - "block.mineralogy.marble_relief_i": "Mármol I alivio", - "block.mineralogy.marble_relief_left": "Mármol Alivio izquierdo", - "block.mineralogy.marble_relief_pickaxe": "Mármol Alivio de pico", - "block.mineralogy.marble_relief_plus": "Mármol Más alivio", - "block.mineralogy.marble_relief_right": "Mármol Alivio correcto", - "block.mineralogy.marble_relief_sword": "Mármol Alivio de espada", - "block.mineralogy.marble_relief_vertical": "Mármol Alivio vertical", - "block.mineralogy.slate_relief_axe": "Pizarra Alivio del hacha", - "block.mineralogy.slate_relief_blank": "Pizarra Alivio en blanco", - "block.mineralogy.slate_relief_cross": "Pizarra Alivio cruzado", - "block.mineralogy.slate_relief_hammer": "Pizarra Alivio del martillo", - "block.mineralogy.slate_relief_hoe": "Pizarra Alivio de azada", - "block.mineralogy.slate_relief_horizontal": "Pizarra Alivio horizontal", - "block.mineralogy.slate_relief_i": "Pizarra I alivio", - "block.mineralogy.slate_relief_left": "Pizarra Alivio izquierdo", - "block.mineralogy.slate_relief_pickaxe": "Pizarra Alivio de pico", - "block.mineralogy.slate_relief_plus": "Pizarra Más alivio", - "block.mineralogy.slate_relief_right": "Pizarra Alivio correcto", - "block.mineralogy.slate_relief_sword": "Pizarra Alivio de espada", - "block.mineralogy.slate_relief_vertical": "Pizarra Alivio vertical", - "block.mineralogy.schist_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.schist_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.schist_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.schist_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.schist_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.schist_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.schist_relief_i": "Esquisto I alivio", - "block.mineralogy.schist_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.schist_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.schist_relief_plus": "Esquisto Más alivio", - "block.mineralogy.schist_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.schist_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.schist_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.gneiss_relief_axe": "Gneis Alivio del hacha", - "block.mineralogy.gneiss_relief_blank": "Gneis Alivio en blanco", - "block.mineralogy.gneiss_relief_cross": "Gneis Alivio cruzado", - "block.mineralogy.gneiss_relief_hammer": "Gneis Alivio del martillo", - "block.mineralogy.gneiss_relief_hoe": "Gneis Alivio de azada", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Alivio horizontal", - "block.mineralogy.gneiss_relief_i": "Gneis I alivio", - "block.mineralogy.gneiss_relief_left": "Gneis Alivio izquierdo", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Alivio de pico", - "block.mineralogy.gneiss_relief_plus": "Gneis Más alivio", - "block.mineralogy.gneiss_relief_right": "Gneis Alivio correcto", - "block.mineralogy.gneiss_relief_sword": "Gneis Alivio de espada", - "block.mineralogy.gneiss_relief_vertical": "Gneis Alivio vertical", - "block.mineralogy.phyllite_relief_axe": "Filita Alivio del hacha", - "block.mineralogy.phyllite_relief_blank": "Filita Alivio en blanco", - "block.mineralogy.phyllite_relief_cross": "Filita Alivio cruzado", - "block.mineralogy.phyllite_relief_hammer": "Filita Alivio del martillo", - "block.mineralogy.phyllite_relief_hoe": "Filita Alivio de azada", - "block.mineralogy.phyllite_relief_horizontal": "Filita Alivio horizontal", - "block.mineralogy.phyllite_relief_i": "Filita I alivio", - "block.mineralogy.phyllite_relief_left": "Filita Alivio izquierdo", - "block.mineralogy.phyllite_relief_pickaxe": "Filita Alivio de pico", - "block.mineralogy.phyllite_relief_plus": "Filita Más alivio", - "block.mineralogy.phyllite_relief_right": "Filita Alivio correcto", - "block.mineralogy.phyllite_relief_sword": "Filita Alivio de espada", - "block.mineralogy.phyllite_relief_vertical": "Filita Alivio vertical", - "block.mineralogy.amphibolite_relief_axe": "Anfibolita Alivio del hacha", - "block.mineralogy.amphibolite_relief_blank": "Anfibolita Alivio en blanco", - "block.mineralogy.amphibolite_relief_cross": "Anfibolita Alivio cruzado", - "block.mineralogy.amphibolite_relief_hammer": "Anfibolita Alivio del martillo", - "block.mineralogy.amphibolite_relief_hoe": "Anfibolita Alivio de azada", - "block.mineralogy.amphibolite_relief_horizontal": "Anfibolita Alivio horizontal", - "block.mineralogy.amphibolite_relief_i": "Anfibolita I alivio", - "block.mineralogy.amphibolite_relief_left": "Anfibolita Alivio izquierdo", - "block.mineralogy.amphibolite_relief_pickaxe": "Anfibolita Alivio de pico", - "block.mineralogy.amphibolite_relief_plus": "Anfibolita Más alivio", - "block.mineralogy.amphibolite_relief_right": "Anfibolita Alivio correcto", - "block.mineralogy.amphibolite_relief_sword": "Anfibolita Alivio de espada", - "block.mineralogy.amphibolite_relief_vertical": "Anfibolita Alivio vertical", - "block.mineralogy.diabase_relief_axe": "Diabasa Alivio del hacha", - "block.mineralogy.diabase_relief_blank": "Diabasa Alivio en blanco", - "block.mineralogy.diabase_relief_cross": "Diabasa Alivio cruzado", - "block.mineralogy.diabase_relief_hammer": "Diabasa Alivio del martillo", - "block.mineralogy.diabase_relief_hoe": "Diabasa Alivio de azada", - "block.mineralogy.diabase_relief_horizontal": "Diabasa Alivio horizontal", - "block.mineralogy.diabase_relief_i": "Diabasa I alivio", - "block.mineralogy.diabase_relief_left": "Diabasa Alivio izquierdo", - "block.mineralogy.diabase_relief_pickaxe": "Diabasa Alivio de pico", - "block.mineralogy.diabase_relief_plus": "Diabasa Más alivio", - "block.mineralogy.diabase_relief_right": "Diabasa Alivio correcto", - "block.mineralogy.diabase_relief_sword": "Diabasa Alivio de espada", - "block.mineralogy.diabase_relief_vertical": "Diabasa Alivio vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Alivio del hacha", - "block.mineralogy.gabbro_relief_blank": "Gabbro Alivio en blanco", - "block.mineralogy.gabbro_relief_cross": "Gabbro Alivio cruzado", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Alivio del martillo", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Alivio de azada", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Alivio horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I alivio", - "block.mineralogy.gabbro_relief_left": "Gabbro Alivio izquierdo", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Alivio de pico", - "block.mineralogy.gabbro_relief_plus": "Gabbro Más alivio", - "block.mineralogy.gabbro_relief_right": "Gabbro Alivio correcto", - "block.mineralogy.gabbro_relief_sword": "Gabbro Alivio de espada", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Alivio vertical", - "block.mineralogy.peridotite_relief_axe": "Peridotita Alivio del hacha", - "block.mineralogy.peridotite_relief_blank": "Peridotita Alivio en blanco", - "block.mineralogy.peridotite_relief_cross": "Peridotita Alivio cruzado", - "block.mineralogy.peridotite_relief_hammer": "Peridotita Alivio del martillo", - "block.mineralogy.peridotite_relief_hoe": "Peridotita Alivio de azada", - "block.mineralogy.peridotite_relief_horizontal": "Peridotita Alivio horizontal", - "block.mineralogy.peridotite_relief_i": "Peridotita I alivio", - "block.mineralogy.peridotite_relief_left": "Peridotita Alivio izquierdo", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotita Alivio de pico", - "block.mineralogy.peridotite_relief_plus": "Peridotita Más alivio", - "block.mineralogy.peridotite_relief_right": "Peridotita Alivio correcto", - "block.mineralogy.peridotite_relief_sword": "Peridotita Alivio de espada", - "block.mineralogy.peridotite_relief_vertical": "Peridotita Alivio vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Vidrio basaltoico Alivio del hacha", - "block.mineralogy.basaltic_glass_relief_blank": "Vidrio basaltoico Alivio en blanco", - "block.mineralogy.basaltic_glass_relief_cross": "Vidrio basaltoico Alivio cruzado", - "block.mineralogy.basaltic_glass_relief_hammer": "Vidrio basaltoico Alivio del martillo", - "block.mineralogy.basaltic_glass_relief_hoe": "Vidrio basaltoico Alivio de azada", - "block.mineralogy.basaltic_glass_relief_horizontal": "Vidrio basaltoico Alivio horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Vidrio basaltoico I alivio", - "block.mineralogy.basaltic_glass_relief_left": "Vidrio basaltoico Alivio izquierdo", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Vidrio basaltoico Alivio de pico", - "block.mineralogy.basaltic_glass_relief_plus": "Vidrio basaltoico Más alivio", - "block.mineralogy.basaltic_glass_relief_right": "Vidrio basaltoico Alivio correcto", - "block.mineralogy.basaltic_glass_relief_sword": "Vidrio basaltoico Alivio de espada", - "block.mineralogy.basaltic_glass_relief_vertical": "Vidrio basaltoico Alivio vertical", - "block.mineralogy.scoria_relief_axe": "Escoria Alivio del hacha", - "block.mineralogy.scoria_relief_blank": "Escoria Alivio en blanco", - "block.mineralogy.scoria_relief_cross": "Escoria Alivio cruzado", - "block.mineralogy.scoria_relief_hammer": "Escoria Alivio del martillo", - "block.mineralogy.scoria_relief_hoe": "Escoria Alivio de azada", - "block.mineralogy.scoria_relief_horizontal": "Escoria Alivio horizontal", - "block.mineralogy.scoria_relief_i": "Escoria I alivio", - "block.mineralogy.scoria_relief_left": "Escoria Alivio izquierdo", - "block.mineralogy.scoria_relief_pickaxe": "Escoria Alivio de pico", - "block.mineralogy.scoria_relief_plus": "Escoria Más alivio", - "block.mineralogy.scoria_relief_right": "Escoria Alivio correcto", - "block.mineralogy.scoria_relief_sword": "Escoria Alivio de espada", - "block.mineralogy.scoria_relief_vertical": "Escoria Alivio vertical", - "block.mineralogy.tuff_relief_axe": "Toba Alivio del hacha", - "block.mineralogy.tuff_relief_blank": "Toba Alivio en blanco", - "block.mineralogy.tuff_relief_cross": "Toba Alivio cruzado", - "block.mineralogy.tuff_relief_hammer": "Toba Alivio del martillo", - "block.mineralogy.tuff_relief_hoe": "Toba Alivio de azada", - "block.mineralogy.tuff_relief_horizontal": "Toba Alivio horizontal", - "block.mineralogy.tuff_relief_i": "Toba I alivio", - "block.mineralogy.tuff_relief_left": "Toba Alivio izquierdo", - "block.mineralogy.tuff_relief_pickaxe": "Toba Alivio de pico", - "block.mineralogy.tuff_relief_plus": "Toba Más alivio", - "block.mineralogy.tuff_relief_right": "Toba Alivio correcto", - "block.mineralogy.tuff_relief_sword": "Toba Alivio de espada", - "block.mineralogy.tuff_relief_vertical": "Toba Alivio vertical", - "block.mineralogy.siltstone_relief_axe": "Siltstone Alivio del hacha", - "block.mineralogy.siltstone_relief_blank": "Siltstone Alivio en blanco", - "block.mineralogy.siltstone_relief_cross": "Siltstone Alivio cruzado", - "block.mineralogy.siltstone_relief_hammer": "Siltstone Alivio del martillo", - "block.mineralogy.siltstone_relief_hoe": "Siltstone Alivio de azada", - "block.mineralogy.siltstone_relief_horizontal": "Siltstone Alivio horizontal", - "block.mineralogy.siltstone_relief_i": "Siltstone I alivio", - "block.mineralogy.siltstone_relief_left": "Siltstone Alivio izquierdo", - "block.mineralogy.siltstone_relief_pickaxe": "Siltstone Alivio de pico", - "block.mineralogy.siltstone_relief_plus": "Siltstone Más alivio", - "block.mineralogy.siltstone_relief_right": "Siltstone Alivio correcto", - "block.mineralogy.siltstone_relief_sword": "Siltstone Alivio de espada", - "block.mineralogy.siltstone_relief_vertical": "Siltstone Alivio vertical", - "block.mineralogy.rock_salt_relief_axe": "Sal de roca Alivio del hacha", - "block.mineralogy.rock_salt_relief_blank": "Sal de roca Alivio en blanco", - "block.mineralogy.rock_salt_relief_cross": "Sal de roca Alivio cruzado", - "block.mineralogy.rock_salt_relief_hammer": "Sal de roca Alivio del martillo", - "block.mineralogy.rock_salt_relief_hoe": "Sal de roca Alivio de azada", - "block.mineralogy.rock_salt_relief_horizontal": "Sal de roca Alivio horizontal", - "block.mineralogy.rock_salt_relief_i": "Sal de roca I alivio", - "block.mineralogy.rock_salt_relief_left": "Sal de roca Alivio izquierdo", - "block.mineralogy.rock_salt_relief_pickaxe": "Sal de roca Alivio de pico", - "block.mineralogy.rock_salt_relief_plus": "Sal de roca Más alivio", - "block.mineralogy.rock_salt_relief_right": "Sal de roca Alivio correcto", - "block.mineralogy.rock_salt_relief_sword": "Sal de roca Alivio de espada", - "block.mineralogy.rock_salt_relief_vertical": "Sal de roca Alivio vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Alivio del hacha", - "block.mineralogy.hornfels_relief_blank": "Hornfels Alivio en blanco", - "block.mineralogy.hornfels_relief_cross": "Hornfels Alivio cruzado", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Alivio del martillo", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Alivio de azada", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Alivio horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I alivio", - "block.mineralogy.hornfels_relief_left": "Hornfels Alivio izquierdo", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Alivio de pico", - "block.mineralogy.hornfels_relief_plus": "Hornfels Más alivio", - "block.mineralogy.hornfels_relief_right": "Hornfels Alivio correcto", - "block.mineralogy.hornfels_relief_sword": "Hornfels Alivio de espada", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Alivio vertical", - "block.mineralogy.quartzite_relief_axe": "Cuarcita Alivio del hacha", - "block.mineralogy.quartzite_relief_blank": "Cuarcita Alivio en blanco", - "block.mineralogy.quartzite_relief_cross": "Cuarcita Alivio cruzado", - "block.mineralogy.quartzite_relief_hammer": "Cuarcita Alivio del martillo", - "block.mineralogy.quartzite_relief_hoe": "Cuarcita Alivio de azada", - "block.mineralogy.quartzite_relief_horizontal": "Cuarcita Alivio horizontal", - "block.mineralogy.quartzite_relief_i": "Cuarcita I alivio", - "block.mineralogy.quartzite_relief_left": "Cuarcita Alivio izquierdo", - "block.mineralogy.quartzite_relief_pickaxe": "Cuarcita Alivio de pico", - "block.mineralogy.quartzite_relief_plus": "Cuarcita Más alivio", - "block.mineralogy.quartzite_relief_right": "Cuarcita Alivio correcto", - "block.mineralogy.quartzite_relief_sword": "Cuarcita Alivio de espada", - "block.mineralogy.quartzite_relief_vertical": "Cuarcita Alivio vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculita Alivio del hacha", - "block.mineralogy.novaculite_relief_blank": "Novaculita Alivio en blanco", - "block.mineralogy.novaculite_relief_cross": "Novaculita Alivio cruzado", - "block.mineralogy.novaculite_relief_hammer": "Novaculita Alivio del martillo", - "block.mineralogy.novaculite_relief_hoe": "Novaculita Alivio de azada", - "block.mineralogy.novaculite_relief_horizontal": "Novaculita Alivio horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculita I alivio", - "block.mineralogy.novaculite_relief_left": "Novaculita Alivio izquierdo", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculita Alivio de pico", - "block.mineralogy.novaculite_relief_plus": "Novaculita Más alivio", - "block.mineralogy.novaculite_relief_right": "Novaculita Alivio correcto", - "block.mineralogy.novaculite_relief_sword": "Novaculita Alivio de espada", - "block.mineralogy.novaculite_relief_vertical": "Novaculita Alivio vertical", - "advancements.mineralogy.all_the_rocks.title": "¡Llama a las rocas Ludo!", - "advancements.mineralogy.all_the_rocks.description": "¡Vaya, has encontrado todos los tipos de rocas estándar en Mineralogía!", - "fluid.mineralogy.crude_oil": "Petróleo Crudo", - "block.mineralogy.crude_oil": "Petróleo Crudo", - "item.mineralogy.crude_oil_bucket": "Balde de petróleo crudo", + "block.mineralogy.andesite_relief_axe": "Relieve de Andesita (hacha)", + "block.mineralogy.andesite_relief_blank": "Relieve de Andesita (sin motivo)", + "block.mineralogy.andesite_relief_cross": "Relieve de Andesita (cruz)", + "block.mineralogy.andesite_relief_hammer": "Relieve de Andesita (martillo)", + "block.mineralogy.andesite_relief_hoe": "Relieve de Andesita (azada)", + "block.mineralogy.andesite_relief_horizontal": "Relieve de Andesita (horizontal)", + "block.mineralogy.andesite_relief_i": "Relieve de Andesita (I)", + "block.mineralogy.andesite_relief_left": "Relieve de Andesita (izquierda)", + "block.mineralogy.andesite_relief_pickaxe": "Relieve de Andesita (pico)", + "block.mineralogy.andesite_relief_plus": "Relieve de Andesita (signo más)", + "block.mineralogy.andesite_relief_right": "Relieve de Andesita (derecha)", + "block.mineralogy.andesite_relief_sword": "Relieve de Andesita (espada)", + "block.mineralogy.andesite_relief_vertical": "Relieve de Andesita (vertical)", + "block.mineralogy.basalt_relief_axe": "Relieve de Basalto (hacha)", + "block.mineralogy.basalt_relief_blank": "Relieve de Basalto (sin motivo)", + "block.mineralogy.basalt_relief_cross": "Relieve de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Relieve de Basalto (martillo)", + "block.mineralogy.basalt_relief_hoe": "Relieve de Basalto (azada)", + "block.mineralogy.basalt_relief_horizontal": "Relieve de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Relieve de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Relieve de Basalto (izquierda)", + "block.mineralogy.basalt_relief_pickaxe": "Relieve de Basalto (pico)", + "block.mineralogy.basalt_relief_plus": "Relieve de Basalto (signo más)", + "block.mineralogy.basalt_relief_right": "Relieve de Basalto (derecha)", + "block.mineralogy.basalt_relief_sword": "Relieve de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Relieve de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Relieve de Diorita (hacha)", + "block.mineralogy.diorite_relief_blank": "Relieve de Diorita (sin motivo)", + "block.mineralogy.diorite_relief_cross": "Relieve de Diorita (cruz)", + "block.mineralogy.diorite_relief_hammer": "Relieve de Diorita (martillo)", + "block.mineralogy.diorite_relief_hoe": "Relieve de Diorita (azada)", + "block.mineralogy.diorite_relief_horizontal": "Relieve de Diorita (horizontal)", + "block.mineralogy.diorite_relief_i": "Relieve de Diorita (I)", + "block.mineralogy.diorite_relief_left": "Relieve de Diorita (izquierda)", + "block.mineralogy.diorite_relief_pickaxe": "Relieve de Diorita (pico)", + "block.mineralogy.diorite_relief_plus": "Relieve de Diorita (signo más)", + "block.mineralogy.diorite_relief_right": "Relieve de Diorita (derecha)", + "block.mineralogy.diorite_relief_sword": "Relieve de Diorita (espada)", + "block.mineralogy.diorite_relief_vertical": "Relieve de Diorita (vertical)", + "block.mineralogy.granite_relief_axe": "Relieve de Granito (hacha)", + "block.mineralogy.granite_relief_blank": "Relieve de Granito (sin motivo)", + "block.mineralogy.granite_relief_cross": "Relieve de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Relieve de Granito (martillo)", + "block.mineralogy.granite_relief_hoe": "Relieve de Granito (azada)", + "block.mineralogy.granite_relief_horizontal": "Relieve de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Relieve de Granito (I)", + "block.mineralogy.granite_relief_left": "Relieve de Granito (izquierda)", + "block.mineralogy.granite_relief_pickaxe": "Relieve de Granito (pico)", + "block.mineralogy.granite_relief_plus": "Relieve de Granito (signo más)", + "block.mineralogy.granite_relief_right": "Relieve de Granito (derecha)", + "block.mineralogy.granite_relief_sword": "Relieve de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Relieve de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Relieve de Riolita (hacha)", + "block.mineralogy.rhyolite_relief_blank": "Relieve de Riolita (sin motivo)", + "block.mineralogy.rhyolite_relief_cross": "Relieve de Riolita (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Relieve de Riolita (martillo)", + "block.mineralogy.rhyolite_relief_hoe": "Relieve de Riolita (azada)", + "block.mineralogy.rhyolite_relief_horizontal": "Relieve de Riolita (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Relieve de Riolita (I)", + "block.mineralogy.rhyolite_relief_left": "Relieve de Riolita (izquierda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relieve de Riolita (pico)", + "block.mineralogy.rhyolite_relief_plus": "Relieve de Riolita (signo más)", + "block.mineralogy.rhyolite_relief_right": "Relieve de Riolita (derecha)", + "block.mineralogy.rhyolite_relief_sword": "Relieve de Riolita (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Relieve de Riolita (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Relieve de Pegmatita (hacha)", + "block.mineralogy.pegmatite_relief_blank": "Relieve de Pegmatita (sin motivo)", + "block.mineralogy.pegmatite_relief_cross": "Relieve de Pegmatita (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Relieve de Pegmatita (martillo)", + "block.mineralogy.pegmatite_relief_hoe": "Relieve de Pegmatita (azada)", + "block.mineralogy.pegmatite_relief_horizontal": "Relieve de Pegmatita (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Relieve de Pegmatita (I)", + "block.mineralogy.pegmatite_relief_left": "Relieve de Pegmatita (izquierda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relieve de Pegmatita (pico)", + "block.mineralogy.pegmatite_relief_plus": "Relieve de Pegmatita (signo más)", + "block.mineralogy.pegmatite_relief_right": "Relieve de Pegmatita (derecha)", + "block.mineralogy.pegmatite_relief_sword": "Relieve de Pegmatita (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Relieve de Pegmatita (vertical)", + "block.mineralogy.shale_relief_axe": "Relieve de Lutita (hacha)", + "block.mineralogy.shale_relief_blank": "Relieve de Lutita (sin motivo)", + "block.mineralogy.shale_relief_cross": "Relieve de Lutita (cruz)", + "block.mineralogy.shale_relief_hammer": "Relieve de Lutita (martillo)", + "block.mineralogy.shale_relief_hoe": "Relieve de Lutita (azada)", + "block.mineralogy.shale_relief_horizontal": "Relieve de Lutita (horizontal)", + "block.mineralogy.shale_relief_i": "Relieve de Lutita (I)", + "block.mineralogy.shale_relief_left": "Relieve de Lutita (izquierda)", + "block.mineralogy.shale_relief_pickaxe": "Relieve de Lutita (pico)", + "block.mineralogy.shale_relief_plus": "Relieve de Lutita (signo más)", + "block.mineralogy.shale_relief_right": "Relieve de Lutita (derecha)", + "block.mineralogy.shale_relief_sword": "Relieve de Lutita (espada)", + "block.mineralogy.shale_relief_vertical": "Relieve de Lutita (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Relieve de Conglomerado (hacha)", + "block.mineralogy.conglomerate_relief_blank": "Relieve de Conglomerado (sin motivo)", + "block.mineralogy.conglomerate_relief_cross": "Relieve de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Relieve de Conglomerado (martillo)", + "block.mineralogy.conglomerate_relief_hoe": "Relieve de Conglomerado (azada)", + "block.mineralogy.conglomerate_relief_horizontal": "Relieve de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Relieve de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Relieve de Conglomerado (izquierda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relieve de Conglomerado (pico)", + "block.mineralogy.conglomerate_relief_plus": "Relieve de Conglomerado (signo más)", + "block.mineralogy.conglomerate_relief_right": "Relieve de Conglomerado (derecha)", + "block.mineralogy.conglomerate_relief_sword": "Relieve de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Relieve de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Relieve de Dolomita (hacha)", + "block.mineralogy.dolomite_relief_blank": "Relieve de Dolomita (sin motivo)", + "block.mineralogy.dolomite_relief_cross": "Relieve de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Relieve de Dolomita (martillo)", + "block.mineralogy.dolomite_relief_hoe": "Relieve de Dolomita (azada)", + "block.mineralogy.dolomite_relief_horizontal": "Relieve de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Relieve de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Relieve de Dolomita (izquierda)", + "block.mineralogy.dolomite_relief_pickaxe": "Relieve de Dolomita (pico)", + "block.mineralogy.dolomite_relief_plus": "Relieve de Dolomita (signo más)", + "block.mineralogy.dolomite_relief_right": "Relieve de Dolomita (derecha)", + "block.mineralogy.dolomite_relief_sword": "Relieve de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Relieve de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Relieve de Caliza (hacha)", + "block.mineralogy.limestone_relief_blank": "Relieve de Caliza (sin motivo)", + "block.mineralogy.limestone_relief_cross": "Relieve de Caliza (cruz)", + "block.mineralogy.limestone_relief_hammer": "Relieve de Caliza (martillo)", + "block.mineralogy.limestone_relief_hoe": "Relieve de Caliza (azada)", + "block.mineralogy.limestone_relief_horizontal": "Relieve de Caliza (horizontal)", + "block.mineralogy.limestone_relief_i": "Relieve de Caliza (I)", + "block.mineralogy.limestone_relief_left": "Relieve de Caliza (izquierda)", + "block.mineralogy.limestone_relief_pickaxe": "Relieve de Caliza (pico)", + "block.mineralogy.limestone_relief_plus": "Relieve de Caliza (signo más)", + "block.mineralogy.limestone_relief_right": "Relieve de Caliza (derecha)", + "block.mineralogy.limestone_relief_sword": "Relieve de Caliza (espada)", + "block.mineralogy.limestone_relief_vertical": "Relieve de Caliza (vertical)", + "block.mineralogy.marble_relief_axe": "Relieve de Mármol (hacha)", + "block.mineralogy.marble_relief_blank": "Relieve de Mármol (sin motivo)", + "block.mineralogy.marble_relief_cross": "Relieve de Mármol (cruz)", + "block.mineralogy.marble_relief_hammer": "Relieve de Mármol (martillo)", + "block.mineralogy.marble_relief_hoe": "Relieve de Mármol (azada)", + "block.mineralogy.marble_relief_horizontal": "Relieve de Mármol (horizontal)", + "block.mineralogy.marble_relief_i": "Relieve de Mármol (I)", + "block.mineralogy.marble_relief_left": "Relieve de Mármol (izquierda)", + "block.mineralogy.marble_relief_pickaxe": "Relieve de Mármol (pico)", + "block.mineralogy.marble_relief_plus": "Relieve de Mármol (signo más)", + "block.mineralogy.marble_relief_right": "Relieve de Mármol (derecha)", + "block.mineralogy.marble_relief_sword": "Relieve de Mármol (espada)", + "block.mineralogy.marble_relief_vertical": "Relieve de Mármol (vertical)", + "block.mineralogy.slate_relief_axe": "Relieve de Pizarra (hacha)", + "block.mineralogy.slate_relief_blank": "Relieve de Pizarra (sin motivo)", + "block.mineralogy.slate_relief_cross": "Relieve de Pizarra (cruz)", + "block.mineralogy.slate_relief_hammer": "Relieve de Pizarra (martillo)", + "block.mineralogy.slate_relief_hoe": "Relieve de Pizarra (azada)", + "block.mineralogy.slate_relief_horizontal": "Relieve de Pizarra (horizontal)", + "block.mineralogy.slate_relief_i": "Relieve de Pizarra (I)", + "block.mineralogy.slate_relief_left": "Relieve de Pizarra (izquierda)", + "block.mineralogy.slate_relief_pickaxe": "Relieve de Pizarra (pico)", + "block.mineralogy.slate_relief_plus": "Relieve de Pizarra (signo más)", + "block.mineralogy.slate_relief_right": "Relieve de Pizarra (derecha)", + "block.mineralogy.slate_relief_sword": "Relieve de Pizarra (espada)", + "block.mineralogy.slate_relief_vertical": "Relieve de Pizarra (vertical)", + "block.mineralogy.schist_relief_axe": "Relieve de Esquisto (hacha)", + "block.mineralogy.schist_relief_blank": "Relieve de Esquisto (sin motivo)", + "block.mineralogy.schist_relief_cross": "Relieve de Esquisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Relieve de Esquisto (martillo)", + "block.mineralogy.schist_relief_hoe": "Relieve de Esquisto (azada)", + "block.mineralogy.schist_relief_horizontal": "Relieve de Esquisto (horizontal)", + "block.mineralogy.schist_relief_i": "Relieve de Esquisto (I)", + "block.mineralogy.schist_relief_left": "Relieve de Esquisto (izquierda)", + "block.mineralogy.schist_relief_pickaxe": "Relieve de Esquisto (pico)", + "block.mineralogy.schist_relief_plus": "Relieve de Esquisto (signo más)", + "block.mineralogy.schist_relief_right": "Relieve de Esquisto (derecha)", + "block.mineralogy.schist_relief_sword": "Relieve de Esquisto (espada)", + "block.mineralogy.schist_relief_vertical": "Relieve de Esquisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Relieve de Gneis (hacha)", + "block.mineralogy.gneiss_relief_blank": "Relieve de Gneis (sin motivo)", + "block.mineralogy.gneiss_relief_cross": "Relieve de Gneis (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Relieve de Gneis (martillo)", + "block.mineralogy.gneiss_relief_hoe": "Relieve de Gneis (azada)", + "block.mineralogy.gneiss_relief_horizontal": "Relieve de Gneis (horizontal)", + "block.mineralogy.gneiss_relief_i": "Relieve de Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relieve de Gneis (izquierda)", + "block.mineralogy.gneiss_relief_pickaxe": "Relieve de Gneis (pico)", + "block.mineralogy.gneiss_relief_plus": "Relieve de Gneis (signo más)", + "block.mineralogy.gneiss_relief_right": "Relieve de Gneis (derecha)", + "block.mineralogy.gneiss_relief_sword": "Relieve de Gneis (espada)", + "block.mineralogy.gneiss_relief_vertical": "Relieve de Gneis (vertical)", + "block.mineralogy.phyllite_relief_axe": "Relieve de Filita (hacha)", + "block.mineralogy.phyllite_relief_blank": "Relieve de Filita (sin motivo)", + "block.mineralogy.phyllite_relief_cross": "Relieve de Filita (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Relieve de Filita (martillo)", + "block.mineralogy.phyllite_relief_hoe": "Relieve de Filita (azada)", + "block.mineralogy.phyllite_relief_horizontal": "Relieve de Filita (horizontal)", + "block.mineralogy.phyllite_relief_i": "Relieve de Filita (I)", + "block.mineralogy.phyllite_relief_left": "Relieve de Filita (izquierda)", + "block.mineralogy.phyllite_relief_pickaxe": "Relieve de Filita (pico)", + "block.mineralogy.phyllite_relief_plus": "Relieve de Filita (signo más)", + "block.mineralogy.phyllite_relief_right": "Relieve de Filita (derecha)", + "block.mineralogy.phyllite_relief_sword": "Relieve de Filita (espada)", + "block.mineralogy.phyllite_relief_vertical": "Relieve de Filita (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Relieve de Anfibolita (hacha)", + "block.mineralogy.amphibolite_relief_blank": "Relieve de Anfibolita (sin motivo)", + "block.mineralogy.amphibolite_relief_cross": "Relieve de Anfibolita (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Relieve de Anfibolita (martillo)", + "block.mineralogy.amphibolite_relief_hoe": "Relieve de Anfibolita (azada)", + "block.mineralogy.amphibolite_relief_horizontal": "Relieve de Anfibolita (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Relieve de Anfibolita (I)", + "block.mineralogy.amphibolite_relief_left": "Relieve de Anfibolita (izquierda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relieve de Anfibolita (pico)", + "block.mineralogy.amphibolite_relief_plus": "Relieve de Anfibolita (signo más)", + "block.mineralogy.amphibolite_relief_right": "Relieve de Anfibolita (derecha)", + "block.mineralogy.amphibolite_relief_sword": "Relieve de Anfibolita (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Relieve de Anfibolita (vertical)", + "block.mineralogy.diabase_relief_axe": "Relieve de Diabasa (hacha)", + "block.mineralogy.diabase_relief_blank": "Relieve de Diabasa (sin motivo)", + "block.mineralogy.diabase_relief_cross": "Relieve de Diabasa (cruz)", + "block.mineralogy.diabase_relief_hammer": "Relieve de Diabasa (martillo)", + "block.mineralogy.diabase_relief_hoe": "Relieve de Diabasa (azada)", + "block.mineralogy.diabase_relief_horizontal": "Relieve de Diabasa (horizontal)", + "block.mineralogy.diabase_relief_i": "Relieve de Diabasa (I)", + "block.mineralogy.diabase_relief_left": "Relieve de Diabasa (izquierda)", + "block.mineralogy.diabase_relief_pickaxe": "Relieve de Diabasa (pico)", + "block.mineralogy.diabase_relief_plus": "Relieve de Diabasa (signo más)", + "block.mineralogy.diabase_relief_right": "Relieve de Diabasa (derecha)", + "block.mineralogy.diabase_relief_sword": "Relieve de Diabasa (espada)", + "block.mineralogy.diabase_relief_vertical": "Relieve de Diabasa (vertical)", + "block.mineralogy.gabbro_relief_axe": "Relieve de Gabro (hacha)", + "block.mineralogy.gabbro_relief_blank": "Relieve de Gabro (sin motivo)", + "block.mineralogy.gabbro_relief_cross": "Relieve de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Relieve de Gabro (martillo)", + "block.mineralogy.gabbro_relief_hoe": "Relieve de Gabro (azada)", + "block.mineralogy.gabbro_relief_horizontal": "Relieve de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Relieve de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Relieve de Gabro (izquierda)", + "block.mineralogy.gabbro_relief_pickaxe": "Relieve de Gabro (pico)", + "block.mineralogy.gabbro_relief_plus": "Relieve de Gabro (signo más)", + "block.mineralogy.gabbro_relief_right": "Relieve de Gabro (derecha)", + "block.mineralogy.gabbro_relief_sword": "Relieve de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Relieve de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Relieve de Peridotita (hacha)", + "block.mineralogy.peridotite_relief_blank": "Relieve de Peridotita (sin motivo)", + "block.mineralogy.peridotite_relief_cross": "Relieve de Peridotita (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Relieve de Peridotita (martillo)", + "block.mineralogy.peridotite_relief_hoe": "Relieve de Peridotita (azada)", + "block.mineralogy.peridotite_relief_horizontal": "Relieve de Peridotita (horizontal)", + "block.mineralogy.peridotite_relief_i": "Relieve de Peridotita (I)", + "block.mineralogy.peridotite_relief_left": "Relieve de Peridotita (izquierda)", + "block.mineralogy.peridotite_relief_pickaxe": "Relieve de Peridotita (pico)", + "block.mineralogy.peridotite_relief_plus": "Relieve de Peridotita (signo más)", + "block.mineralogy.peridotite_relief_right": "Relieve de Peridotita (derecha)", + "block.mineralogy.peridotite_relief_sword": "Relieve de Peridotita (espada)", + "block.mineralogy.peridotite_relief_vertical": "Relieve de Peridotita (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Relieve de Vidrio basáltico (hacha)", + "block.mineralogy.basaltic_glass_relief_blank": "Relieve de Vidrio basáltico (sin motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Relieve de Vidrio basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relieve de Vidrio basáltico (martillo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relieve de Vidrio basáltico (azada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relieve de Vidrio basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Relieve de Vidrio basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relieve de Vidrio basáltico (izquierda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relieve de Vidrio basáltico (pico)", + "block.mineralogy.basaltic_glass_relief_plus": "Relieve de Vidrio basáltico (signo más)", + "block.mineralogy.basaltic_glass_relief_right": "Relieve de Vidrio basáltico (derecha)", + "block.mineralogy.basaltic_glass_relief_sword": "Relieve de Vidrio basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relieve de Vidrio basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Relieve de Escoria (hacha)", + "block.mineralogy.scoria_relief_blank": "Relieve de Escoria (sin motivo)", + "block.mineralogy.scoria_relief_cross": "Relieve de Escoria (cruz)", + "block.mineralogy.scoria_relief_hammer": "Relieve de Escoria (martillo)", + "block.mineralogy.scoria_relief_hoe": "Relieve de Escoria (azada)", + "block.mineralogy.scoria_relief_horizontal": "Relieve de Escoria (horizontal)", + "block.mineralogy.scoria_relief_i": "Relieve de Escoria (I)", + "block.mineralogy.scoria_relief_left": "Relieve de Escoria (izquierda)", + "block.mineralogy.scoria_relief_pickaxe": "Relieve de Escoria (pico)", + "block.mineralogy.scoria_relief_plus": "Relieve de Escoria (signo más)", + "block.mineralogy.scoria_relief_right": "Relieve de Escoria (derecha)", + "block.mineralogy.scoria_relief_sword": "Relieve de Escoria (espada)", + "block.mineralogy.scoria_relief_vertical": "Relieve de Escoria (vertical)", + "block.mineralogy.tuff_relief_axe": "Relieve de Toba (hacha)", + "block.mineralogy.tuff_relief_blank": "Relieve de Toba (sin motivo)", + "block.mineralogy.tuff_relief_cross": "Relieve de Toba (cruz)", + "block.mineralogy.tuff_relief_hammer": "Relieve de Toba (martillo)", + "block.mineralogy.tuff_relief_hoe": "Relieve de Toba (azada)", + "block.mineralogy.tuff_relief_horizontal": "Relieve de Toba (horizontal)", + "block.mineralogy.tuff_relief_i": "Relieve de Toba (I)", + "block.mineralogy.tuff_relief_left": "Relieve de Toba (izquierda)", + "block.mineralogy.tuff_relief_pickaxe": "Relieve de Toba (pico)", + "block.mineralogy.tuff_relief_plus": "Relieve de Toba (signo más)", + "block.mineralogy.tuff_relief_right": "Relieve de Toba (derecha)", + "block.mineralogy.tuff_relief_sword": "Relieve de Toba (espada)", + "block.mineralogy.tuff_relief_vertical": "Relieve de Toba (vertical)", + "block.mineralogy.siltstone_relief_axe": "Relieve de Limolita (hacha)", + "block.mineralogy.siltstone_relief_blank": "Relieve de Limolita (sin motivo)", + "block.mineralogy.siltstone_relief_cross": "Relieve de Limolita (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Relieve de Limolita (martillo)", + "block.mineralogy.siltstone_relief_hoe": "Relieve de Limolita (azada)", + "block.mineralogy.siltstone_relief_horizontal": "Relieve de Limolita (horizontal)", + "block.mineralogy.siltstone_relief_i": "Relieve de Limolita (I)", + "block.mineralogy.siltstone_relief_left": "Relieve de Limolita (izquierda)", + "block.mineralogy.siltstone_relief_pickaxe": "Relieve de Limolita (pico)", + "block.mineralogy.siltstone_relief_plus": "Relieve de Limolita (signo más)", + "block.mineralogy.siltstone_relief_right": "Relieve de Limolita (derecha)", + "block.mineralogy.siltstone_relief_sword": "Relieve de Limolita (espada)", + "block.mineralogy.siltstone_relief_vertical": "Relieve de Limolita (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Relieve de Sal de roca (hacha)", + "block.mineralogy.rock_salt_relief_blank": "Relieve de Sal de roca (sin motivo)", + "block.mineralogy.rock_salt_relief_cross": "Relieve de Sal de roca (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Relieve de Sal de roca (martillo)", + "block.mineralogy.rock_salt_relief_hoe": "Relieve de Sal de roca (azada)", + "block.mineralogy.rock_salt_relief_horizontal": "Relieve de Sal de roca (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Relieve de Sal de roca (I)", + "block.mineralogy.rock_salt_relief_left": "Relieve de Sal de roca (izquierda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relieve de Sal de roca (pico)", + "block.mineralogy.rock_salt_relief_plus": "Relieve de Sal de roca (signo más)", + "block.mineralogy.rock_salt_relief_right": "Relieve de Sal de roca (derecha)", + "block.mineralogy.rock_salt_relief_sword": "Relieve de Sal de roca (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Relieve de Sal de roca (vertical)", + "block.mineralogy.hornfels_relief_axe": "Relieve de Corneana (hacha)", + "block.mineralogy.hornfels_relief_blank": "Relieve de Corneana (sin motivo)", + "block.mineralogy.hornfels_relief_cross": "Relieve de Corneana (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Relieve de Corneana (martillo)", + "block.mineralogy.hornfels_relief_hoe": "Relieve de Corneana (azada)", + "block.mineralogy.hornfels_relief_horizontal": "Relieve de Corneana (horizontal)", + "block.mineralogy.hornfels_relief_i": "Relieve de Corneana (I)", + "block.mineralogy.hornfels_relief_left": "Relieve de Corneana (izquierda)", + "block.mineralogy.hornfels_relief_pickaxe": "Relieve de Corneana (pico)", + "block.mineralogy.hornfels_relief_plus": "Relieve de Corneana (signo más)", + "block.mineralogy.hornfels_relief_right": "Relieve de Corneana (derecha)", + "block.mineralogy.hornfels_relief_sword": "Relieve de Corneana (espada)", + "block.mineralogy.hornfels_relief_vertical": "Relieve de Corneana (vertical)", + "block.mineralogy.quartzite_relief_axe": "Relieve de Cuarcita (hacha)", + "block.mineralogy.quartzite_relief_blank": "Relieve de Cuarcita (sin motivo)", + "block.mineralogy.quartzite_relief_cross": "Relieve de Cuarcita (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Relieve de Cuarcita (martillo)", + "block.mineralogy.quartzite_relief_hoe": "Relieve de Cuarcita (azada)", + "block.mineralogy.quartzite_relief_horizontal": "Relieve de Cuarcita (horizontal)", + "block.mineralogy.quartzite_relief_i": "Relieve de Cuarcita (I)", + "block.mineralogy.quartzite_relief_left": "Relieve de Cuarcita (izquierda)", + "block.mineralogy.quartzite_relief_pickaxe": "Relieve de Cuarcita (pico)", + "block.mineralogy.quartzite_relief_plus": "Relieve de Cuarcita (signo más)", + "block.mineralogy.quartzite_relief_right": "Relieve de Cuarcita (derecha)", + "block.mineralogy.quartzite_relief_sword": "Relieve de Cuarcita (espada)", + "block.mineralogy.quartzite_relief_vertical": "Relieve de Cuarcita (vertical)", + "block.mineralogy.novaculite_relief_axe": "Relieve de Novaculita (hacha)", + "block.mineralogy.novaculite_relief_blank": "Relieve de Novaculita (sin motivo)", + "block.mineralogy.novaculite_relief_cross": "Relieve de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Relieve de Novaculita (martillo)", + "block.mineralogy.novaculite_relief_hoe": "Relieve de Novaculita (azada)", + "block.mineralogy.novaculite_relief_horizontal": "Relieve de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Relieve de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Relieve de Novaculita (izquierda)", + "block.mineralogy.novaculite_relief_pickaxe": "Relieve de Novaculita (pico)", + "block.mineralogy.novaculite_relief_plus": "Relieve de Novaculita (signo más)", + "block.mineralogy.novaculite_relief_right": "Relieve de Novaculita (derecha)", + "block.mineralogy.novaculite_relief_sword": "Relieve de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Relieve de Novaculita (vertical)", "itemGroup.mineralogy.mineralogy": "Mineralogía", - "itemGroup.mineralogy.rock": "Mineralogía de rocas", + "itemGroup.mineralogy.rock": "Rocas de Mineralogía", "itemGroup.mineralogy.stair": "Escaleras de Mineralogía", "itemGroup.mineralogy.slab": "Losas de Mineralogía", "itemGroup.mineralogy.wall": "Muros de Mineralogía", - "itemGroup.mineralogy.item": "Artículos de Mineralogía" + "itemGroup.mineralogy.item": "Objetos de Mineralogía", + "block.mineralogy.crude_oil": "Petróleo crudo", + "item.mineralogy.crude_oil_bucket": "Cubo de petróleo crudo", + "fluid.mineralogy.crude_oil": "Petróleo crudo", + "advancements.mineralogy.all_the_rocks.title": "Todas las rocas", + "advancements.mineralogy.all_the_rocks.description": "¡Has encontrado todos los tipos de roca estándar de Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/fr_ca.json b/src/main/resources/assets/mineralogy/lang/fr_ca.json index e58696710..adfa816a0 100644 --- a/src/main/resources/assets/mineralogy/lang/fr_ca.json +++ b/src/main/resources/assets/mineralogy/lang/fr_ca.json @@ -1,196 +1,196 @@ { "block.mineralogy.andesite": "Andésite", - "block.mineralogy.andesite_stairs": "Escaliers Andésites", - "block.mineralogy.andesite_slab": "Dalle d'Andésite", - "block.mineralogy.andesite_brick": "Brique d'Andésite", - "block.mineralogy.andesite_brick_stairs": "Escaliers en brique d'Andesite", - "block.mineralogy.andesite_brick_slab": "Dalle de brique d'Andesite", - "block.mineralogy.andesite_smooth": "Andésite polie", - "block.mineralogy.andesite_smooth_stairs": "Escaliers polis d'Andésite", - "block.mineralogy.andesite_smooth_slab": "Dalle polie d'Andésite", - "block.mineralogy.andesite_smooth_brick": "Brique polie d'Andésite", - "block.mineralogy.andesite_smooth_brick_stairs": "Escaliers en brique polis par Andesite", - "block.mineralogy.andesite_smooth_brick_slab": "Dalle de brique polie d'Andésite", + "block.mineralogy.andesite_stairs": "Escalier en Andésite", + "block.mineralogy.andesite_slab": "Dalle en Andésite", + "block.mineralogy.andesite_brick": "Briques en Andésite", + "block.mineralogy.andesite_brick_stairs": "Escalier en briques de Andésite", + "block.mineralogy.andesite_brick_slab": "Dalle en briques de Andésite", + "block.mineralogy.andesite_smooth": "Bloc poli en Andésite", + "block.mineralogy.andesite_smooth_stairs": "Escalier poli en Andésite", + "block.mineralogy.andesite_smooth_slab": "Dalle polie en Andésite", + "block.mineralogy.andesite_smooth_brick": "Briques polies en Andésite", + "block.mineralogy.andesite_smooth_brick_stairs": "Escalier en briques polies de Andésite", + "block.mineralogy.andesite_smooth_brick_slab": "Dalle en briques polies de Andésite", "block.mineralogy.basalt": "Basalte", - "block.mineralogy.basalt_stairs": "Escaliers basaltiques", - "block.mineralogy.basalt_slab": "Dalle de basalte", - "block.mineralogy.basalt_brick": "Brique de basalte", - "block.mineralogy.basalt_brick_stairs": "Escaliers de brique de basalte", - "block.mineralogy.basalt_brick_slab": "Dalle de brique de basalte", - "block.mineralogy.basalt_smooth": "Basalte poli", - "block.mineralogy.basalt_smooth_stairs": "Escaliers polis au basalte", - "block.mineralogy.basalt_smooth_slab": "Dalle polie au basalte", - "block.mineralogy.basalt_smooth_brick": "Brique polie au basalte", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaliers en brique polis au basalte", - "block.mineralogy.basalt_smooth_brick_slab": "Dalle de brique polie au basalte", + "block.mineralogy.basalt_stairs": "Escalier en Basalte", + "block.mineralogy.basalt_slab": "Dalle en Basalte", + "block.mineralogy.basalt_brick": "Briques en Basalte", + "block.mineralogy.basalt_brick_stairs": "Escalier en briques de Basalte", + "block.mineralogy.basalt_brick_slab": "Dalle en briques de Basalte", + "block.mineralogy.basalt_smooth": "Bloc poli en Basalte", + "block.mineralogy.basalt_smooth_stairs": "Escalier poli en Basalte", + "block.mineralogy.basalt_smooth_slab": "Dalle polie en Basalte", + "block.mineralogy.basalt_smooth_brick": "Briques polies en Basalte", + "block.mineralogy.basalt_smooth_brick_stairs": "Escalier en briques polies de Basalte", + "block.mineralogy.basalt_smooth_brick_slab": "Dalle en briques polies de Basalte", "block.mineralogy.diorite": "Diorite", - "block.mineralogy.diorite_stairs": "Escaliers Diorite", - "block.mineralogy.diorite_slab": "Dalle de Diorite", - "block.mineralogy.diorite_brick": "Brique Diorite", - "block.mineralogy.diorite_brick_stairs": "Escaliers en brique Diorite", - "block.mineralogy.diorite_brick_slab": "Dalle de brique Diorite", - "block.mineralogy.diorite_smooth": "Diorite polie", - "block.mineralogy.diorite_smooth_stairs": "Escaliers polis au Diorite", - "block.mineralogy.diorite_smooth_slab": "Dalle polie Diorite", - "block.mineralogy.diorite_smooth_brick": "Brique polie Diorite", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaliers en briques polies Diorite", - "block.mineralogy.diorite_smooth_brick_slab": "Dalle de brique polie Diorite", - "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Escaliers en granit", - "block.mineralogy.granite_slab": "Dalle de granit", - "block.mineralogy.granite_brick": "Brique de granit", - "block.mineralogy.granite_brick_stairs": "Escaliers en brique de granit", - "block.mineralogy.granite_brick_slab": "Dalle de brique de granit", - "block.mineralogy.granite_smooth": "Granit poli", - "block.mineralogy.granite_smooth_stairs": "Escaliers polis de granit", - "block.mineralogy.granite_smooth_slab": "Dalle polie de granit", - "block.mineralogy.granite_smooth_brick": "Brique polie de granit", - "block.mineralogy.granite_smooth_brick_stairs": "Escaliers en brique polis de granit", - "block.mineralogy.granite_smooth_brick_slab": "Dalle de brique polie de granit", + "block.mineralogy.diorite_stairs": "Escalier en Diorite", + "block.mineralogy.diorite_slab": "Dalle en Diorite", + "block.mineralogy.diorite_brick": "Briques en Diorite", + "block.mineralogy.diorite_brick_stairs": "Escalier en briques de Diorite", + "block.mineralogy.diorite_brick_slab": "Dalle en briques de Diorite", + "block.mineralogy.diorite_smooth": "Bloc poli en Diorite", + "block.mineralogy.diorite_smooth_stairs": "Escalier poli en Diorite", + "block.mineralogy.diorite_smooth_slab": "Dalle polie en Diorite", + "block.mineralogy.diorite_smooth_brick": "Briques polies en Diorite", + "block.mineralogy.diorite_smooth_brick_stairs": "Escalier en briques polies de Diorite", + "block.mineralogy.diorite_smooth_brick_slab": "Dalle en briques polies de Diorite", + "block.mineralogy.granite": "Granite", + "block.mineralogy.granite_stairs": "Escalier en Granite", + "block.mineralogy.granite_slab": "Dalle en Granite", + "block.mineralogy.granite_brick": "Briques en Granite", + "block.mineralogy.granite_brick_stairs": "Escalier en briques de Granite", + "block.mineralogy.granite_brick_slab": "Dalle en briques de Granite", + "block.mineralogy.granite_smooth": "Bloc poli en Granite", + "block.mineralogy.granite_smooth_stairs": "Escalier poli en Granite", + "block.mineralogy.granite_smooth_slab": "Dalle polie en Granite", + "block.mineralogy.granite_smooth_brick": "Briques polies en Granite", + "block.mineralogy.granite_smooth_brick_stairs": "Escalier en briques polies de Granite", + "block.mineralogy.granite_smooth_brick_slab": "Dalle en briques polies de Granite", "block.mineralogy.rhyolite": "Rhyolite", - "block.mineralogy.rhyolite_stairs": "Escaliers en rhyolite", - "block.mineralogy.rhyolite_slab": "Dalle de rhyolite", - "block.mineralogy.rhyolite_brick": "Brique de rhyolite", - "block.mineralogy.rhyolite_brick_stairs": "Escaliers en brique de rhyolite", - "block.mineralogy.rhyolite_brick_slab": "Dalle de brique de rhyolite", - "block.mineralogy.rhyolite_smooth": "Rhyolite polie", - "block.mineralogy.rhyolite_smooth_stairs": "Escaliers polis à la rhyolite", - "block.mineralogy.rhyolite_smooth_slab": "Dalle polie à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick": "Brique polie de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaliers en briques polies à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle de brique polie rhyolite", + "block.mineralogy.rhyolite_stairs": "Escalier en Rhyolite", + "block.mineralogy.rhyolite_slab": "Dalle en Rhyolite", + "block.mineralogy.rhyolite_brick": "Briques en Rhyolite", + "block.mineralogy.rhyolite_brick_stairs": "Escalier en briques de Rhyolite", + "block.mineralogy.rhyolite_brick_slab": "Dalle en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth": "Bloc poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_stairs": "Escalier poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_slab": "Dalle polie en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick": "Briques polies en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escalier en briques polies de Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle en briques polies de Rhyolite", "block.mineralogy.pegmatite": "Pegmatite", - "block.mineralogy.pegmatite_stairs": "Escaliers en Pegmatite", - "block.mineralogy.pegmatite_slab": "Dalle de Pegmatite", - "block.mineralogy.pegmatite_brick": "Brique de Pegmatite", - "block.mineralogy.pegmatite_brick_stairs": "Escaliers en brique de Pegmatite", - "block.mineralogy.pegmatite_brick_slab": "Dalle de brique de Pegmatite", - "block.mineralogy.pegmatite_smooth": "Pegmatite polie", - "block.mineralogy.pegmatite_smooth_stairs": "Escaliers polis à la Pegmatite", - "block.mineralogy.pegmatite_smooth_slab": "Dalle polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick": "Brique polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaliers en briques polies à la Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle de brique polie par Pegmatite", + "block.mineralogy.pegmatite_stairs": "Escalier en Pegmatite", + "block.mineralogy.pegmatite_slab": "Dalle en Pegmatite", + "block.mineralogy.pegmatite_brick": "Briques en Pegmatite", + "block.mineralogy.pegmatite_brick_stairs": "Escalier en briques de Pegmatite", + "block.mineralogy.pegmatite_brick_slab": "Dalle en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth": "Bloc poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_stairs": "Escalier poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_slab": "Dalle polie en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick": "Briques polies en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escalier en briques polies de Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle en briques polies de Pegmatite", "block.mineralogy.shale": "Schiste argileux", - "block.mineralogy.shale_stairs": "Escaliers de schiste", - "block.mineralogy.shale_slab": "Dalle de schiste", - "block.mineralogy.shale_brick": "Brique de schiste", - "block.mineralogy.shale_brick_stairs": "Escaliers de briques de schiste", - "block.mineralogy.shale_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.shale_smooth": "Schiste poli", - "block.mineralogy.shale_smooth_stairs": "Escaliers polis au schiste", - "block.mineralogy.shale_smooth_slab": "Dalle polie au schiste", - "block.mineralogy.shale_smooth_brick": "Brique polie schiste", - "block.mineralogy.shale_smooth_brick_stairs": "Escaliers de brique polis au schiste", - "block.mineralogy.shale_smooth_brick_slab": "Dalle de brique polie au schiste", + "block.mineralogy.shale_stairs": "Escalier en Schiste argileux", + "block.mineralogy.shale_slab": "Dalle en Schiste argileux", + "block.mineralogy.shale_brick": "Briques en Schiste argileux", + "block.mineralogy.shale_brick_stairs": "Escalier en briques de Schiste argileux", + "block.mineralogy.shale_brick_slab": "Dalle en briques de Schiste argileux", + "block.mineralogy.shale_smooth": "Bloc poli en Schiste argileux", + "block.mineralogy.shale_smooth_stairs": "Escalier poli en Schiste argileux", + "block.mineralogy.shale_smooth_slab": "Dalle polie en Schiste argileux", + "block.mineralogy.shale_smooth_brick": "Briques polies en Schiste argileux", + "block.mineralogy.shale_smooth_brick_stairs": "Escalier en briques polies de Schiste argileux", + "block.mineralogy.shale_smooth_brick_slab": "Dalle en briques polies de Schiste argileux", "block.mineralogy.conglomerate": "Conglomérat", - "block.mineralogy.conglomerate_stairs": "Escaliers du Conglomérat", - "block.mineralogy.conglomerate_slab": "Dalle de conglomérat", - "block.mineralogy.conglomerate_brick": "Brique Conglomérat", - "block.mineralogy.conglomerate_brick_stairs": "Escaliers en brique de Conglomérat", - "block.mineralogy.conglomerate_brick_slab": "Dalle de brique de conglomérat", - "block.mineralogy.conglomerate_smooth": "Conglomérat poli", - "block.mineralogy.conglomerate_smooth_stairs": "Escaliers polis au conglomérat", - "block.mineralogy.conglomerate_smooth_slab": "Conglomerate dalle polie", - "block.mineralogy.conglomerate_smooth_brick": "Conglomerate brique polie", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Conglomerate poli escalier en brique", - "block.mineralogy.conglomerate_smooth_brick_slab": "Plaque de brique polie Conglomerate", + "block.mineralogy.conglomerate_stairs": "Escalier en Conglomérat", + "block.mineralogy.conglomerate_slab": "Dalle en Conglomérat", + "block.mineralogy.conglomerate_brick": "Briques en Conglomérat", + "block.mineralogy.conglomerate_brick_stairs": "Escalier en briques de Conglomérat", + "block.mineralogy.conglomerate_brick_slab": "Dalle en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth": "Bloc poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_stairs": "Escalier poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_slab": "Dalle polie en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick": "Briques polies en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escalier en briques polies de Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Dalle en briques polies de Conglomérat", "block.mineralogy.dolomite": "Dolomie", - "block.mineralogy.dolomite_stairs": "Escaliers en dolomite", - "block.mineralogy.dolomite_slab": "Dalle de dolomite", - "block.mineralogy.dolomite_brick": "Brique de dolomite", - "block.mineralogy.dolomite_brick_stairs": "Escaliers de brique en dolomite", - "block.mineralogy.dolomite_brick_slab": "Dalle de brique en dolomite", - "block.mineralogy.dolomite_smooth": "Dolomite polie", - "block.mineralogy.dolomite_smooth_stairs": "Escaliers polis en dolomite", - "block.mineralogy.dolomite_smooth_slab": "Dalle polie en dolomite", - "block.mineralogy.dolomite_smooth_brick": "Brique polie de Dolomite", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaliers en briques polies dolomitiques", - "block.mineralogy.dolomite_smooth_brick_slab": "Dalle de brique polie en dolomite", + "block.mineralogy.dolomite_stairs": "Escalier en Dolomie", + "block.mineralogy.dolomite_slab": "Dalle en Dolomie", + "block.mineralogy.dolomite_brick": "Briques en Dolomie", + "block.mineralogy.dolomite_brick_stairs": "Escalier en briques de Dolomie", + "block.mineralogy.dolomite_brick_slab": "Dalle en briques de Dolomie", + "block.mineralogy.dolomite_smooth": "Bloc poli en Dolomie", + "block.mineralogy.dolomite_smooth_stairs": "Escalier poli en Dolomie", + "block.mineralogy.dolomite_smooth_slab": "Dalle polie en Dolomie", + "block.mineralogy.dolomite_smooth_brick": "Briques polies en Dolomie", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escalier en briques polies de Dolomie", + "block.mineralogy.dolomite_smooth_brick_slab": "Dalle en briques polies de Dolomie", "block.mineralogy.limestone": "Calcaire", - "block.mineralogy.limestone_stairs": "Escaliers en calcaire", - "block.mineralogy.limestone_slab": "Dalle de calcaire", - "block.mineralogy.limestone_brick": "Brique de calcaire", - "block.mineralogy.limestone_brick_stairs": "Escaliers en brique calcaire", - "block.mineralogy.limestone_brick_slab": "Dalle de brique en calcaire", - "block.mineralogy.limestone_smooth": "Calcaire poli", - "block.mineralogy.limestone_smooth_stairs": "Escaliers polis au calcaire", - "block.mineralogy.limestone_smooth_slab": "Dalle polie en calcaire", - "block.mineralogy.limestone_smooth_brick": "Brique polie au calcaire", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaliers en briques polis à la chaux", - "block.mineralogy.limestone_smooth_brick_slab": "Dalle de brique polie au calcaire", + "block.mineralogy.limestone_stairs": "Escalier en Calcaire", + "block.mineralogy.limestone_slab": "Dalle en Calcaire", + "block.mineralogy.limestone_brick": "Briques en Calcaire", + "block.mineralogy.limestone_brick_stairs": "Escalier en briques de Calcaire", + "block.mineralogy.limestone_brick_slab": "Dalle en briques de Calcaire", + "block.mineralogy.limestone_smooth": "Bloc poli en Calcaire", + "block.mineralogy.limestone_smooth_stairs": "Escalier poli en Calcaire", + "block.mineralogy.limestone_smooth_slab": "Dalle polie en Calcaire", + "block.mineralogy.limestone_smooth_brick": "Briques polies en Calcaire", + "block.mineralogy.limestone_smooth_brick_stairs": "Escalier en briques polies de Calcaire", + "block.mineralogy.limestone_smooth_brick_slab": "Dalle en briques polies de Calcaire", "block.mineralogy.slate": "Ardoise", - "block.mineralogy.slate_stairs": "Escaliers en ardoise", - "block.mineralogy.slate_slab": "Dalle d'ardoise", - "block.mineralogy.slate_brick": "Brique d'ardoise", - "block.mineralogy.slate_brick_stairs": "Escaliers en briques d'ardoise", - "block.mineralogy.slate_brick_slab": "Dalle de briques d'ardoise", - "block.mineralogy.slate_smooth": "Ardoise polie", - "block.mineralogy.slate_smooth_stairs": "Escaliers polis en ardoise", - "block.mineralogy.slate_smooth_slab": "Dalle polie en ardoise", - "block.mineralogy.slate_smooth_brick": "Brique polie d'ardoise", - "block.mineralogy.slate_smooth_brick_stairs": "Escaliers en brique polie en ardoise", - "block.mineralogy.slate_smooth_brick_slab": "Dalle de brique polie ardoise", - "block.mineralogy.schist": "Schiste", - "block.mineralogy.schist_stairs": "Escaliers de schiste", - "block.mineralogy.schist_slab": "Dalle de schiste", - "block.mineralogy.schist_brick": "Brique de schiste", - "block.mineralogy.schist_brick_stairs": "Escaliers en brique de schiste", - "block.mineralogy.schist_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.schist_smooth": "Schiste poli", - "block.mineralogy.schist_smooth_stairs": "Escaliers polis Schiste", - "block.mineralogy.schist_smooth_slab": "Dalle polie par schiste", - "block.mineralogy.schist_smooth_brick": "Brique polie par schiste", - "block.mineralogy.schist_smooth_brick_stairs": "Escaliers de brique polis par schiste", - "block.mineralogy.schist_smooth_brick_slab": "Dalle de brique polie par schiste", + "block.mineralogy.slate_stairs": "Escalier en Ardoise", + "block.mineralogy.slate_slab": "Dalle en Ardoise", + "block.mineralogy.slate_brick": "Briques en Ardoise", + "block.mineralogy.slate_brick_stairs": "Escalier en briques de Ardoise", + "block.mineralogy.slate_brick_slab": "Dalle en briques de Ardoise", + "block.mineralogy.slate_smooth": "Bloc poli en Ardoise", + "block.mineralogy.slate_smooth_stairs": "Escalier poli en Ardoise", + "block.mineralogy.slate_smooth_slab": "Dalle polie en Ardoise", + "block.mineralogy.slate_smooth_brick": "Briques polies en Ardoise", + "block.mineralogy.slate_smooth_brick_stairs": "Escalier en briques polies de Ardoise", + "block.mineralogy.slate_smooth_brick_slab": "Dalle en briques polies de Ardoise", + "block.mineralogy.schist": "Micaschiste", + "block.mineralogy.schist_stairs": "Escalier en Micaschiste", + "block.mineralogy.schist_slab": "Dalle en Micaschiste", + "block.mineralogy.schist_brick": "Briques en Micaschiste", + "block.mineralogy.schist_brick_stairs": "Escalier en briques de Micaschiste", + "block.mineralogy.schist_brick_slab": "Dalle en briques de Micaschiste", + "block.mineralogy.schist_smooth": "Bloc poli en Micaschiste", + "block.mineralogy.schist_smooth_stairs": "Escalier poli en Micaschiste", + "block.mineralogy.schist_smooth_slab": "Dalle polie en Micaschiste", + "block.mineralogy.schist_smooth_brick": "Briques polies en Micaschiste", + "block.mineralogy.schist_smooth_brick_stairs": "Escalier en briques polies de Micaschiste", + "block.mineralogy.schist_smooth_brick_slab": "Dalle en briques polies de Micaschiste", "block.mineralogy.gneiss": "Gneiss", - "block.mineralogy.gneiss_stairs": "Escaliers de gneiss", - "block.mineralogy.gneiss_slab": "Dalle de gneiss", - "block.mineralogy.gneiss_brick": "Brique de gneiss", - "block.mineralogy.gneiss_brick_stairs": "Escaliers en brique de gneiss", - "block.mineralogy.gneiss_brick_slab": "Dalle de brique de gneiss", - "block.mineralogy.gneiss_smooth": "Gneiss poli", - "block.mineralogy.gneiss_smooth_stairs": "Escaliers polis Gneiss", - "block.mineralogy.gneiss_smooth_slab": "Dalle polie au gneiss", - "block.mineralogy.gneiss_smooth_brick": "Brique polie gneiss", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaliers en brique polis gneiss", - "block.mineralogy.gneiss_smooth_brick_slab": "Dalle de brique polie par gneiss", + "block.mineralogy.gneiss_stairs": "Escalier en Gneiss", + "block.mineralogy.gneiss_slab": "Dalle en Gneiss", + "block.mineralogy.gneiss_brick": "Briques en Gneiss", + "block.mineralogy.gneiss_brick_stairs": "Escalier en briques de Gneiss", + "block.mineralogy.gneiss_brick_slab": "Dalle en briques de Gneiss", + "block.mineralogy.gneiss_smooth": "Bloc poli en Gneiss", + "block.mineralogy.gneiss_smooth_stairs": "Escalier poli en Gneiss", + "block.mineralogy.gneiss_smooth_slab": "Dalle polie en Gneiss", + "block.mineralogy.gneiss_smooth_brick": "Briques polies en Gneiss", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escalier en briques polies de Gneiss", + "block.mineralogy.gneiss_smooth_brick_slab": "Dalle en briques polies de Gneiss", "block.mineralogy.marble": "Marbre", - "block.mineralogy.marble_stairs": "Escaliers en marbre", - "block.mineralogy.marble_slab": "Dalle de marbre", - "block.mineralogy.marble_brick": "Brique de marbre", - "block.mineralogy.marble_brick_stairs": "Escaliers en brique de marbre", - "block.mineralogy.marble_brick_slab": "Dalle de brique en marbre", - "block.mineralogy.marble_smooth": "Marbre poli", - "block.mineralogy.marble_smooth_stairs": "Escaliers polis en marbre", - "block.mineralogy.marble_smooth_slab": "Dalle polie en marbre", - "block.mineralogy.marble_smooth_brick": "Brique polie en marbre", - "block.mineralogy.marble_smooth_brick_stairs": "Escaliers en brique polis en marbre", - "block.mineralogy.marble_smooth_brick_slab": "Dalle de brique polie en marbre", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaliers en phyllite", - "block.mineralogy.phyllite_slab": "Dalle de Phyllite", - "block.mineralogy.phyllite_brick": "Brique de phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaliers en brique de phyllite", - "block.mineralogy.phyllite_brick_slab": "Dalle de brique de phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite polie", - "block.mineralogy.phyllite_smooth_stairs": "Escaliers polis en phyllite", - "block.mineralogy.phyllite_smooth_slab": "Dalle polie en phyllite", - "block.mineralogy.phyllite_smooth_brick": "Brique polie de phyllite", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaliers en briques polies en phyllite", - "block.mineralogy.phyllite_smooth_brick_slab": "Dalle de brique poli en phyllite", + "block.mineralogy.marble_stairs": "Escalier en Marbre", + "block.mineralogy.marble_slab": "Dalle en Marbre", + "block.mineralogy.marble_brick": "Briques en Marbre", + "block.mineralogy.marble_brick_stairs": "Escalier en briques de Marbre", + "block.mineralogy.marble_brick_slab": "Dalle en briques de Marbre", + "block.mineralogy.marble_smooth": "Bloc poli en Marbre", + "block.mineralogy.marble_smooth_stairs": "Escalier poli en Marbre", + "block.mineralogy.marble_smooth_slab": "Dalle polie en Marbre", + "block.mineralogy.marble_smooth_brick": "Briques polies en Marbre", + "block.mineralogy.marble_smooth_brick_stairs": "Escalier en briques polies de Marbre", + "block.mineralogy.marble_smooth_brick_slab": "Dalle en briques polies de Marbre", + "block.mineralogy.phyllite": "Phyllade", + "block.mineralogy.phyllite_stairs": "Escalier en Phyllade", + "block.mineralogy.phyllite_slab": "Dalle en Phyllade", + "block.mineralogy.phyllite_brick": "Briques en Phyllade", + "block.mineralogy.phyllite_brick_stairs": "Escalier en briques de Phyllade", + "block.mineralogy.phyllite_brick_slab": "Dalle en briques de Phyllade", + "block.mineralogy.phyllite_smooth": "Bloc poli en Phyllade", + "block.mineralogy.phyllite_smooth_stairs": "Escalier poli en Phyllade", + "block.mineralogy.phyllite_smooth_slab": "Dalle polie en Phyllade", + "block.mineralogy.phyllite_smooth_brick": "Briques polies en Phyllade", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escalier en briques polies de Phyllade", + "block.mineralogy.phyllite_smooth_brick_slab": "Dalle en briques polies de Phyllade", "block.mineralogy.amphibolite": "Amphibolite", - "block.mineralogy.amphibolite_stairs": "Escaliers amphibolites", - "block.mineralogy.amphibolite_slab": "Plaque d'amphibolite", - "block.mineralogy.amphibolite_brick": "Brique d'amphibolite", - "block.mineralogy.amphibolite_brick_stairs": "Escaliers en brique amphibolite", - "block.mineralogy.amphibolite_brick_slab": "Plaque de brique d'amphibolite", - "block.mineralogy.amphibolite_smooth": "Amphibolite polie", - "block.mineralogy.amphibolite_smooth_stairs": "Escaliers polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_slab": "Dalle polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick": "Brique polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaliers en brique polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_slab": "Plaque de brique polie à l'amphibolite", + "block.mineralogy.amphibolite_stairs": "Escalier en Amphibolite", + "block.mineralogy.amphibolite_slab": "Dalle en Amphibolite", + "block.mineralogy.amphibolite_brick": "Briques en Amphibolite", + "block.mineralogy.amphibolite_brick_stairs": "Escalier en briques de Amphibolite", + "block.mineralogy.amphibolite_brick_slab": "Dalle en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth": "Bloc poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_stairs": "Escalier poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_slab": "Dalle polie en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick": "Briques polies en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escalier en briques polies de Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_slab": "Dalle en briques polies de Amphibolite", "item.mineralogy.gypsum_dust": "Poudre de gypse", "item.mineralogy.sulfur_dust": "Poudre de soufre", "item.mineralogy.phosphorous_dust": "Poudre de phosphore", @@ -201,740 +201,740 @@ "block.mineralogy.pumice": "Pierre ponce", "block.mineralogy.sulfur_block": "Soufre", "block.mineralogy.sulfur_ore": "Minerai de soufre", - "block.mineralogy.phosphorous_block": "Phosphoreux", + "block.mineralogy.phosphorous_block": "Phosphore", "block.mineralogy.phosphorous_ore": "Minerai de phosphore", "block.mineralogy.nitrate_block": "Nitrate", "block.mineralogy.nitrate_ore": "Minerai de nitrate", - "block.mineralogy.drywall_black": "Cloison sèche noire", - "block.mineralogy.drywall_red": "Cloison sèche rouge", - "block.mineralogy.drywall_green": "Cloison sèche verte", - "block.mineralogy.drywall_brown": "Cloison sèche brune", - "block.mineralogy.drywall_blue": "Cloison sèche bleue", - "block.mineralogy.drywall_purple": "Cloison sèche pourpre", - "block.mineralogy.drywall_cyan": "Cloison sèche cyan", - "block.mineralogy.drywall_silver": "Cloison sèche plafond gris", - "block.mineralogy.drywall_gray": "Cloison sèche grise", - "block.mineralogy.drywall_pink": "Cloison sèche rose", - "block.mineralogy.drywall_lime": "Cloison sèche vert-lime", - "block.mineralogy.drywall_yellow": "Cloison sèche jaune", - "block.mineralogy.drywall_light_blue": "Cloison sèche bleu clair", - "block.mineralogy.drywall_magenta": "Cloison sèche magenta", - "block.mineralogy.drywall_orange": "Cloison sèche orange", - "block.mineralogy.drywall_white": "Cloison sèche blanche", - "block.mineralogy.andesite_wall": "Mur d'Andésite", - "block.mineralogy.andesite_brick_wall": "Mur de briques d'Andésite", - "block.mineralogy.andesite_smooth_wall": "Mur poli d'Andésite", - "block.mineralogy.andesite_smooth_brick_wall": "Mur de briques polies par Andesite", - "block.mineralogy.basalt_wall": "Mur de basalte", - "block.mineralogy.basalt_brick_wall": "Mur de brique de basalte", - "block.mineralogy.basalt_smooth_wall": "Mur poli au basalte", - "block.mineralogy.basalt_smooth_brick_wall": "Mur de briques polies au basalte", - "block.mineralogy.diorite_wall": "Mur de Diorite", - "block.mineralogy.diorite_brick_wall": "Mur de briques Diorite", - "block.mineralogy.diorite_smooth_wall": "Mur Poli Diorite", - "block.mineralogy.diorite_smooth_brick_wall": "Mur de briques poli Diorite", - "block.mineralogy.granite_wall": "Mur de granit", - "block.mineralogy.granite_brick_wall": "Mur de briques de granit", - "block.mineralogy.granite_smooth_wall": "Mur poli de granit", - "block.mineralogy.granite_smooth_brick_wall": "Mur de briques poli de granit", - "block.mineralogy.rhyolite_wall": "Mur de rhyolite", - "block.mineralogy.rhyolite_brick_wall": "Mur de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_wall": "Mur poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_wall": "Mur de briques polies à la rhyolite", - "block.mineralogy.pegmatite_wall": "Mur de Pegmatite", - "block.mineralogy.pegmatite_brick_wall": "Mur de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_wall": "Mur poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_wall": "Mur de briques poli à la Pegmatite", - "block.mineralogy.shale_wall": "Mur de schiste", - "block.mineralogy.shale_brick_wall": "Mur de briques de schiste", - "block.mineralogy.shale_smooth_wall": "Mur poli de schiste", - "block.mineralogy.shale_smooth_brick_wall": "Mur de briques polies au schiste", - "block.mineralogy.conglomerate_wall": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_wall": "Mur de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_wall": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_wall": "Mur de dolomite", - "block.mineralogy.dolomite_brick_wall": "Mur de briques de dolomite", - "block.mineralogy.dolomite_smooth_wall": "Mur poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_wall": "Mur de briques poli à la dolomite", - "block.mineralogy.limestone_wall": "Mur de calcaire", - "block.mineralogy.limestone_brick_wall": "Mur de briques en calcaire", - "block.mineralogy.limestone_smooth_wall": "Mur poli au calcaire", - "block.mineralogy.limestone_smooth_brick_wall": "Mur de briques poli au calcaire", - "block.mineralogy.marble_wall": "Mur de marbre", - "block.mineralogy.marble_brick_wall": "Mur de briques en marbre", - "block.mineralogy.marble_smooth_wall": "Mur poli en marbre", - "block.mineralogy.marble_smooth_brick_wall": "Mur de briques polies en marbre", - "block.mineralogy.slate_wall": "Mur d'ardoise", - "block.mineralogy.slate_brick_wall": "Mur de briques d'ardoise", - "block.mineralogy.slate_smooth_wall": "Mur d'ardoise poli", - "block.mineralogy.slate_smooth_brick_wall": "Ardoise polie mur de briques", - "block.mineralogy.schist_wall": "Mur de schiste", - "block.mineralogy.schist_brick_wall": "Mur de briques de schiste", - "block.mineralogy.schist_smooth_wall": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_wall": "Mur de briques schist poli", - "block.mineralogy.gneiss_wall": "Mur de gneiss", - "block.mineralogy.gneiss_brick_wall": "Mur de briques en gneiss", - "block.mineralogy.gneiss_smooth_wall": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_wall": "Mur de phyllite", - "block.mineralogy.phyllite_brick_wall": "Mur de briques de phyllite", - "block.mineralogy.phyllite_smooth_wall": "Mur poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_wall": "Mur de briques poli en phyllite", - "block.mineralogy.amphibolite_wall": "Mur d'amphibolite", - "block.mineralogy.amphibolite_brick_wall": "Mur de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_wall": "Mur poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_wall": "Mur de briques poli à l'amphibolite", - "block.mineralogy.andesite_furnace": "Four à andésite", - "block.mineralogy.andesite_brick_furnace": "Four à briques d'andésite", - "block.mineralogy.andesite_smooth_furnace": "Four poli à andésite", - "block.mineralogy.andesite_smooth_brick_furnace": "Four à briques polies andésite", - "block.mineralogy.basalt_furnace": "Four à basalte", - "block.mineralogy.basalt_brick_furnace": "Four à briques de basalte", - "block.mineralogy.basalt_smooth_furnace": "Four à basalte poli", - "block.mineralogy.basalt_smooth_brick_furnace": "Four à briques polies en basalte", - "block.mineralogy.diorite_furnace": "Fourneau de Diorite", - "block.mineralogy.diorite_brick_furnace": "Fourneau de briques Diorite", - "block.mineralogy.diorite_smooth_furnace": "Fourneau Poli Diorite", - "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau de briques poli Diorite", - "block.mineralogy.granite_furnace": "Fourneau de granit", - "block.mineralogy.granite_brick_furnace": "Fourneau de briques de granit", - "block.mineralogy.granite_smooth_furnace": "Fourneau poli de granit", - "block.mineralogy.granite_smooth_brick_furnace": "Fourneau de briques poli de granit", - "block.mineralogy.rhyolite_furnace": "Fourneau de rhyolite", - "block.mineralogy.rhyolite_brick_furnace": "Fourneau de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau de briques polies à la rhyolite", - "block.mineralogy.pegmatite_furnace": "Fourneau de Pegmatite", - "block.mineralogy.pegmatite_brick_furnace": "Fourneau de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau de briques poli à la Pegmatite", - "block.mineralogy.shale_furnace": "Fourneau de schiste", - "block.mineralogy.shale_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.shale_smooth_furnace": "Fourneau poli de schiste", - "block.mineralogy.shale_smooth_brick_furnace": "Fourneau de briques polies au schiste", - "block.mineralogy.conglomerate_furnace": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_furnace": "Fourneau de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_furnace": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_furnace": "Fourneau de dolomite", - "block.mineralogy.dolomite_brick_furnace": "Fourneau de briques de dolomite", - "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau de briques poli à la dolomite", - "block.mineralogy.limestone_furnace": "Fourneau de calcaire", - "block.mineralogy.limestone_brick_furnace": "Fourneau de briques en calcaire", - "block.mineralogy.limestone_smooth_furnace": "Fourneau poli au calcaire", - "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau de briques poli au calcaire", - "block.mineralogy.marble_furnace": "Fourneau de marbre", - "block.mineralogy.marble_brick_furnace": "Fourneau de briques en marbre", - "block.mineralogy.marble_smooth_furnace": "Fourneau poli en marbre", - "block.mineralogy.marble_smooth_brick_furnace": "Fourneau de briques polies en marbre", - "block.mineralogy.slate_furnace": "Fourneau d'ardoise", - "block.mineralogy.slate_brick_furnace": "Fourneau de briques d'ardoise", - "block.mineralogy.slate_smooth_furnace": "Fourneau d'ardoise poli", - "block.mineralogy.slate_smooth_brick_furnace": "Ardoise polie mur de briques", - "block.mineralogy.schist_furnace": "Fourneau de schiste", - "block.mineralogy.schist_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.schist_smooth_furnace": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_furnace": "Fourneau de briques schist poli", - "block.mineralogy.gneiss_furnace": "Fourneau de gneiss", - "block.mineralogy.gneiss_brick_furnace": "Fourneau de briques en gneiss", - "block.mineralogy.gneiss_smooth_furnace": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_furnace": "Fourneau de phyllite", - "block.mineralogy.phyllite_brick_furnace": "Fourneau de briques de phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau de briques poli en phyllite", - "block.mineralogy.amphibolite_furnace": "Fourneau d'amphibolite", - "block.mineralogy.amphibolite_brick_furnace": "Fourneau de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau de briques poli à l'amphibolite", + "block.mineralogy.drywall_black": "Plaque de plâtre noire", + "block.mineralogy.drywall_red": "Plaque de plâtre rouge", + "block.mineralogy.drywall_green": "Plaque de plâtre verte", + "block.mineralogy.drywall_brown": "Plaque de plâtre marron", + "block.mineralogy.drywall_blue": "Plaque de plâtre bleue", + "block.mineralogy.drywall_purple": "Plaque de plâtre violette", + "block.mineralogy.drywall_cyan": "Plaque de plâtre cyan", + "block.mineralogy.drywall_silver": "Plaque de plâtre gris clair", + "block.mineralogy.drywall_gray": "Plaque de plâtre grise", + "block.mineralogy.drywall_pink": "Plaque de plâtre rose", + "block.mineralogy.drywall_lime": "Plaque de plâtre vert citron", + "block.mineralogy.drywall_yellow": "Plaque de plâtre jaune", + "block.mineralogy.drywall_light_blue": "Plaque de plâtre bleu clair", + "block.mineralogy.drywall_magenta": "Plaque de plâtre magenta", + "block.mineralogy.drywall_orange": "Plaque de plâtre orange", + "block.mineralogy.drywall_white": "Plaque de plâtre blanche", + "block.mineralogy.andesite_wall": "Muret en Andésite", + "block.mineralogy.andesite_brick_wall": "Muret en briques de Andésite", + "block.mineralogy.andesite_smooth_wall": "Muret poli en Andésite", + "block.mineralogy.andesite_smooth_brick_wall": "Muret en briques polies de Andésite", + "block.mineralogy.basalt_wall": "Muret en Basalte", + "block.mineralogy.basalt_brick_wall": "Muret en briques de Basalte", + "block.mineralogy.basalt_smooth_wall": "Muret poli en Basalte", + "block.mineralogy.basalt_smooth_brick_wall": "Muret en briques polies de Basalte", + "block.mineralogy.diorite_wall": "Muret en Diorite", + "block.mineralogy.diorite_brick_wall": "Muret en briques de Diorite", + "block.mineralogy.diorite_smooth_wall": "Muret poli en Diorite", + "block.mineralogy.diorite_smooth_brick_wall": "Muret en briques polies de Diorite", + "block.mineralogy.granite_wall": "Muret en Granite", + "block.mineralogy.granite_brick_wall": "Muret en briques de Granite", + "block.mineralogy.granite_smooth_wall": "Muret poli en Granite", + "block.mineralogy.granite_smooth_brick_wall": "Muret en briques polies de Granite", + "block.mineralogy.rhyolite_wall": "Muret en Rhyolite", + "block.mineralogy.rhyolite_brick_wall": "Muret en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_wall": "Muret poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muret en briques polies de Rhyolite", + "block.mineralogy.pegmatite_wall": "Muret en Pegmatite", + "block.mineralogy.pegmatite_brick_wall": "Muret en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_wall": "Muret poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muret en briques polies de Pegmatite", + "block.mineralogy.shale_wall": "Muret en Schiste argileux", + "block.mineralogy.shale_brick_wall": "Muret en briques de Schiste argileux", + "block.mineralogy.shale_smooth_wall": "Muret poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_wall": "Muret en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_wall": "Muret en Conglomérat", + "block.mineralogy.conglomerate_brick_wall": "Muret en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_wall": "Muret poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muret en briques polies de Conglomérat", + "block.mineralogy.dolomite_wall": "Muret en Dolomie", + "block.mineralogy.dolomite_brick_wall": "Muret en briques de Dolomie", + "block.mineralogy.dolomite_smooth_wall": "Muret poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_wall": "Muret en briques polies de Dolomie", + "block.mineralogy.limestone_wall": "Muret en Calcaire", + "block.mineralogy.limestone_brick_wall": "Muret en briques de Calcaire", + "block.mineralogy.limestone_smooth_wall": "Muret poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_wall": "Muret en briques polies de Calcaire", + "block.mineralogy.marble_wall": "Muret en Marbre", + "block.mineralogy.marble_brick_wall": "Muret en briques de Marbre", + "block.mineralogy.marble_smooth_wall": "Muret poli en Marbre", + "block.mineralogy.marble_smooth_brick_wall": "Muret en briques polies de Marbre", + "block.mineralogy.slate_wall": "Muret en Ardoise", + "block.mineralogy.slate_brick_wall": "Muret en briques de Ardoise", + "block.mineralogy.slate_smooth_wall": "Muret poli en Ardoise", + "block.mineralogy.slate_smooth_brick_wall": "Muret en briques polies de Ardoise", + "block.mineralogy.schist_wall": "Muret en Micaschiste", + "block.mineralogy.schist_brick_wall": "Muret en briques de Micaschiste", + "block.mineralogy.schist_smooth_wall": "Muret poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_wall": "Muret en briques polies de Micaschiste", + "block.mineralogy.gneiss_wall": "Muret en Gneiss", + "block.mineralogy.gneiss_brick_wall": "Muret en briques de Gneiss", + "block.mineralogy.gneiss_smooth_wall": "Muret poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_wall": "Muret en briques polies de Gneiss", + "block.mineralogy.phyllite_wall": "Muret en Phyllade", + "block.mineralogy.phyllite_brick_wall": "Muret en briques de Phyllade", + "block.mineralogy.phyllite_smooth_wall": "Muret poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_wall": "Muret en briques polies de Phyllade", + "block.mineralogy.amphibolite_wall": "Muret en Amphibolite", + "block.mineralogy.amphibolite_brick_wall": "Muret en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_wall": "Muret poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muret en briques polies de Amphibolite", + "block.mineralogy.andesite_furnace": "Fourneau en Andésite", + "block.mineralogy.andesite_brick_furnace": "Fourneau en briques de Andésite", + "block.mineralogy.andesite_smooth_furnace": "Fourneau poli en Andésite", + "block.mineralogy.andesite_smooth_brick_furnace": "Fourneau en briques polies de Andésite", + "block.mineralogy.basalt_furnace": "Fourneau en Basalte", + "block.mineralogy.basalt_brick_furnace": "Fourneau en briques de Basalte", + "block.mineralogy.basalt_smooth_furnace": "Fourneau poli en Basalte", + "block.mineralogy.basalt_smooth_brick_furnace": "Fourneau en briques polies de Basalte", + "block.mineralogy.diorite_furnace": "Fourneau en Diorite", + "block.mineralogy.diorite_brick_furnace": "Fourneau en briques de Diorite", + "block.mineralogy.diorite_smooth_furnace": "Fourneau poli en Diorite", + "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau en briques polies de Diorite", + "block.mineralogy.granite_furnace": "Fourneau en Granite", + "block.mineralogy.granite_brick_furnace": "Fourneau en briques de Granite", + "block.mineralogy.granite_smooth_furnace": "Fourneau poli en Granite", + "block.mineralogy.granite_smooth_brick_furnace": "Fourneau en briques polies de Granite", + "block.mineralogy.rhyolite_furnace": "Fourneau en Rhyolite", + "block.mineralogy.rhyolite_brick_furnace": "Fourneau en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau en briques polies de Rhyolite", + "block.mineralogy.pegmatite_furnace": "Fourneau en Pegmatite", + "block.mineralogy.pegmatite_brick_furnace": "Fourneau en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau en briques polies de Pegmatite", + "block.mineralogy.shale_furnace": "Fourneau en Schiste argileux", + "block.mineralogy.shale_brick_furnace": "Fourneau en briques de Schiste argileux", + "block.mineralogy.shale_smooth_furnace": "Fourneau poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_furnace": "Fourneau en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_furnace": "Fourneau en Conglomérat", + "block.mineralogy.conglomerate_brick_furnace": "Fourneau en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_furnace": "Fourneau poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fourneau en briques polies de Conglomérat", + "block.mineralogy.dolomite_furnace": "Fourneau en Dolomie", + "block.mineralogy.dolomite_brick_furnace": "Fourneau en briques de Dolomie", + "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau en briques polies de Dolomie", + "block.mineralogy.limestone_furnace": "Fourneau en Calcaire", + "block.mineralogy.limestone_brick_furnace": "Fourneau en briques de Calcaire", + "block.mineralogy.limestone_smooth_furnace": "Fourneau poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau en briques polies de Calcaire", + "block.mineralogy.marble_furnace": "Fourneau en Marbre", + "block.mineralogy.marble_brick_furnace": "Fourneau en briques de Marbre", + "block.mineralogy.marble_smooth_furnace": "Fourneau poli en Marbre", + "block.mineralogy.marble_smooth_brick_furnace": "Fourneau en briques polies de Marbre", + "block.mineralogy.slate_furnace": "Fourneau en Ardoise", + "block.mineralogy.slate_brick_furnace": "Fourneau en briques de Ardoise", + "block.mineralogy.slate_smooth_furnace": "Fourneau poli en Ardoise", + "block.mineralogy.slate_smooth_brick_furnace": "Fourneau en briques polies de Ardoise", + "block.mineralogy.schist_furnace": "Fourneau en Micaschiste", + "block.mineralogy.schist_brick_furnace": "Fourneau en briques de Micaschiste", + "block.mineralogy.schist_smooth_furnace": "Fourneau poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_furnace": "Fourneau en briques polies de Micaschiste", + "block.mineralogy.gneiss_furnace": "Fourneau en Gneiss", + "block.mineralogy.gneiss_brick_furnace": "Fourneau en briques de Gneiss", + "block.mineralogy.gneiss_smooth_furnace": "Fourneau poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fourneau en briques polies de Gneiss", + "block.mineralogy.phyllite_furnace": "Fourneau en Phyllade", + "block.mineralogy.phyllite_brick_furnace": "Fourneau en briques de Phyllade", + "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau en briques polies de Phyllade", + "block.mineralogy.amphibolite_furnace": "Fourneau en Amphibolite", + "block.mineralogy.amphibolite_brick_furnace": "Fourneau en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau en briques polies de Amphibolite", "block.mineralogy.diabase": "Diabase", - "block.mineralogy.diabase_stairs": "Diabase Escaliers", - "block.mineralogy.diabase_slab": "Diabase Dalle", - "block.mineralogy.diabase_brick": "Diabase Brique", - "block.mineralogy.diabase_brick_stairs": "Diabase Escalier De Brique", - "block.mineralogy.diabase_brick_slab": "Diabase Dalle de brique", - "block.mineralogy.diabase_smooth": "Polished Diabase", - "block.mineralogy.diabase_smooth_stairs": "Diabase Escalier Poli", - "block.mineralogy.diabase_smooth_slab": "Diabase Dalle polie", - "block.mineralogy.diabase_smooth_brick": "Diabase Brique polie", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabase Escalier en brique polie", - "block.mineralogy.diabase_smooth_brick_slab": "Diabase Dalle de brique polie", - "block.mineralogy.diabase_wall": "Diabase Wall", - "block.mineralogy.diabase_brick_wall": "Diabase Mur de briques", - "block.mineralogy.diabase_smooth_wall": "Diabase Mur poli", - "block.mineralogy.diabase_smooth_brick_wall": "Diabase Mur de brique poli", - "block.mineralogy.diabase_furnace": "Diabase Furnace", - "block.mineralogy.diabase_brick_furnace": "Diabase Four à briques", - "block.mineralogy.diabase_smooth_furnace": "Diabase Four poli", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabase Four à brique polie", + "block.mineralogy.diabase_stairs": "Escalier en Diabase", + "block.mineralogy.diabase_slab": "Dalle en Diabase", + "block.mineralogy.diabase_brick": "Briques en Diabase", + "block.mineralogy.diabase_brick_stairs": "Escalier en briques de Diabase", + "block.mineralogy.diabase_brick_slab": "Dalle en briques de Diabase", + "block.mineralogy.diabase_smooth": "Bloc poli en Diabase", + "block.mineralogy.diabase_smooth_stairs": "Escalier poli en Diabase", + "block.mineralogy.diabase_smooth_slab": "Dalle polie en Diabase", + "block.mineralogy.diabase_smooth_brick": "Briques polies en Diabase", + "block.mineralogy.diabase_smooth_brick_stairs": "Escalier en briques polies de Diabase", + "block.mineralogy.diabase_smooth_brick_slab": "Dalle en briques polies de Diabase", + "block.mineralogy.diabase_wall": "Muret en Diabase", + "block.mineralogy.diabase_brick_wall": "Muret en briques de Diabase", + "block.mineralogy.diabase_smooth_wall": "Muret poli en Diabase", + "block.mineralogy.diabase_smooth_brick_wall": "Muret en briques polies de Diabase", + "block.mineralogy.diabase_furnace": "Fourneau en Diabase", + "block.mineralogy.diabase_brick_furnace": "Fourneau en briques de Diabase", + "block.mineralogy.diabase_smooth_furnace": "Fourneau poli en Diabase", + "block.mineralogy.diabase_smooth_brick_furnace": "Fourneau en briques polies de Diabase", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escaliers", - "block.mineralogy.gabbro_slab": "Gabbro Dalle", - "block.mineralogy.gabbro_brick": "Gabbro Brique", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escalier De Brique", - "block.mineralogy.gabbro_brick_slab": "Gabbro Dalle de brique", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escalier Poli", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Dalle polie", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Brique polie", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Escalier en brique polie", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Dalle de brique polie", - "block.mineralogy.gabbro_wall": "Gabbro Wall", - "block.mineralogy.gabbro_brick_wall": "Gabbro Mur de briques", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Mur poli", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Mur de brique poli", - "block.mineralogy.gabbro_furnace": "Gabbro Furnace", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Four à briques", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Four poli", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Four à brique polie", + "block.mineralogy.gabbro_stairs": "Escalier en Gabbro", + "block.mineralogy.gabbro_slab": "Dalle en Gabbro", + "block.mineralogy.gabbro_brick": "Briques en Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Escalier en briques de Gabbro", + "block.mineralogy.gabbro_brick_slab": "Dalle en briques de Gabbro", + "block.mineralogy.gabbro_smooth": "Bloc poli en Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Escalier poli en Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Dalle polie en Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Briques polies en Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escalier en briques polies de Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Dalle en briques polies de Gabbro", + "block.mineralogy.gabbro_wall": "Muret en Gabbro", + "block.mineralogy.gabbro_brick_wall": "Muret en briques de Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Muret poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muret en briques polies de Gabbro", + "block.mineralogy.gabbro_furnace": "Fourneau en Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Fourneau en briques de Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Fourneau poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fourneau en briques polies de Gabbro", "block.mineralogy.peridotite": "Péridotite", - "block.mineralogy.peridotite_stairs": "Péridotite Escaliers", - "block.mineralogy.peridotite_slab": "Péridotite Dalle", - "block.mineralogy.peridotite_brick": "Péridotite Brique", - "block.mineralogy.peridotite_brick_stairs": "Péridotite Escalier De Brique", - "block.mineralogy.peridotite_brick_slab": "Péridotite Dalle de brique", - "block.mineralogy.peridotite_smooth": "Polished Péridotite", - "block.mineralogy.peridotite_smooth_stairs": "Péridotite Escalier Poli", - "block.mineralogy.peridotite_smooth_slab": "Péridotite Dalle polie", - "block.mineralogy.peridotite_smooth_brick": "Péridotite Brique polie", - "block.mineralogy.peridotite_smooth_brick_stairs": "Péridotite Escalier en brique polie", - "block.mineralogy.peridotite_smooth_brick_slab": "Péridotite Dalle de brique polie", - "block.mineralogy.peridotite_wall": "Péridotite Wall", - "block.mineralogy.peridotite_brick_wall": "Péridotite Mur de briques", - "block.mineralogy.peridotite_smooth_wall": "Péridotite Mur poli", - "block.mineralogy.peridotite_smooth_brick_wall": "Péridotite Mur de brique poli", - "block.mineralogy.peridotite_furnace": "Péridotite Furnace", - "block.mineralogy.peridotite_brick_furnace": "Péridotite Four à briques", - "block.mineralogy.peridotite_smooth_furnace": "Péridotite Four poli", - "block.mineralogy.peridotite_smooth_brick_furnace": "Péridotite Four à brique polie", + "block.mineralogy.peridotite_stairs": "Escalier en Péridotite", + "block.mineralogy.peridotite_slab": "Dalle en Péridotite", + "block.mineralogy.peridotite_brick": "Briques en Péridotite", + "block.mineralogy.peridotite_brick_stairs": "Escalier en briques de Péridotite", + "block.mineralogy.peridotite_brick_slab": "Dalle en briques de Péridotite", + "block.mineralogy.peridotite_smooth": "Bloc poli en Péridotite", + "block.mineralogy.peridotite_smooth_stairs": "Escalier poli en Péridotite", + "block.mineralogy.peridotite_smooth_slab": "Dalle polie en Péridotite", + "block.mineralogy.peridotite_smooth_brick": "Briques polies en Péridotite", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escalier en briques polies de Péridotite", + "block.mineralogy.peridotite_smooth_brick_slab": "Dalle en briques polies de Péridotite", + "block.mineralogy.peridotite_wall": "Muret en Péridotite", + "block.mineralogy.peridotite_brick_wall": "Muret en briques de Péridotite", + "block.mineralogy.peridotite_smooth_wall": "Muret poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_wall": "Muret en briques polies de Péridotite", + "block.mineralogy.peridotite_furnace": "Fourneau en Péridotite", + "block.mineralogy.peridotite_brick_furnace": "Fourneau en briques de Péridotite", + "block.mineralogy.peridotite_smooth_furnace": "Fourneau poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fourneau en briques polies de Péridotite", "block.mineralogy.basaltic_glass": "Verre basaltique", - "block.mineralogy.basaltic_glass_stairs": "Verre basaltique Escaliers", - "block.mineralogy.basaltic_glass_slab": "Verre basaltique Dalle", - "block.mineralogy.basaltic_glass_brick": "Verre basaltique Brique", - "block.mineralogy.basaltic_glass_brick_stairs": "Verre basaltique Escalier De Brique", - "block.mineralogy.basaltic_glass_brick_slab": "Verre basaltique Dalle de brique", - "block.mineralogy.basaltic_glass_smooth": "Polished Verre basaltique", - "block.mineralogy.basaltic_glass_smooth_stairs": "Verre basaltique Escalier Poli", - "block.mineralogy.basaltic_glass_smooth_slab": "Verre basaltique Dalle polie", - "block.mineralogy.basaltic_glass_smooth_brick": "Verre basaltique Brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Verre basaltique Escalier en brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Verre basaltique Dalle de brique polie", - "block.mineralogy.basaltic_glass_wall": "Verre basaltique Wall", - "block.mineralogy.basaltic_glass_brick_wall": "Verre basaltique Mur de briques", - "block.mineralogy.basaltic_glass_smooth_wall": "Verre basaltique Mur poli", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Verre basaltique Mur de brique poli", - "block.mineralogy.basaltic_glass_furnace": "Verre basaltique Furnace", - "block.mineralogy.basaltic_glass_brick_furnace": "Verre basaltique Four à briques", - "block.mineralogy.basaltic_glass_smooth_furnace": "Verre basaltique Four poli", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Verre basaltique Four à brique polie", - "block.mineralogy.scoria": "Scories", - "block.mineralogy.scoria_stairs": "Scories Escaliers", - "block.mineralogy.scoria_slab": "Scories Dalle", - "block.mineralogy.scoria_brick": "Scories Brique", - "block.mineralogy.scoria_brick_stairs": "Scories Escalier De Brique", - "block.mineralogy.scoria_brick_slab": "Scories Dalle de brique", - "block.mineralogy.scoria_smooth": "Polished Scories", - "block.mineralogy.scoria_smooth_stairs": "Scories Escalier Poli", - "block.mineralogy.scoria_smooth_slab": "Scories Dalle polie", - "block.mineralogy.scoria_smooth_brick": "Scories Brique polie", - "block.mineralogy.scoria_smooth_brick_stairs": "Scories Escalier en brique polie", - "block.mineralogy.scoria_smooth_brick_slab": "Scories Dalle de brique polie", - "block.mineralogy.scoria_wall": "Scories Wall", - "block.mineralogy.scoria_brick_wall": "Scories Mur de briques", - "block.mineralogy.scoria_smooth_wall": "Scories Mur poli", - "block.mineralogy.scoria_smooth_brick_wall": "Scories Mur de brique poli", - "block.mineralogy.scoria_furnace": "Scories Furnace", - "block.mineralogy.scoria_brick_furnace": "Scories Four à briques", - "block.mineralogy.scoria_smooth_furnace": "Scories Four poli", - "block.mineralogy.scoria_smooth_brick_furnace": "Scories Four à brique polie", + "block.mineralogy.basaltic_glass_stairs": "Escalier en Verre basaltique", + "block.mineralogy.basaltic_glass_slab": "Dalle en Verre basaltique", + "block.mineralogy.basaltic_glass_brick": "Briques en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_stairs": "Escalier en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_brick_slab": "Dalle en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth": "Bloc poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escalier poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_slab": "Dalle polie en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick": "Briques polies en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escalier en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Dalle en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_wall": "Muret en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_wall": "Muret en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_wall": "Muret poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muret en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_furnace": "Fourneau en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_furnace": "Fourneau en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fourneau poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fourneau en briques polies de Verre basaltique", + "block.mineralogy.scoria": "Scorie", + "block.mineralogy.scoria_stairs": "Escalier en Scorie", + "block.mineralogy.scoria_slab": "Dalle en Scorie", + "block.mineralogy.scoria_brick": "Briques en Scorie", + "block.mineralogy.scoria_brick_stairs": "Escalier en briques de Scorie", + "block.mineralogy.scoria_brick_slab": "Dalle en briques de Scorie", + "block.mineralogy.scoria_smooth": "Bloc poli en Scorie", + "block.mineralogy.scoria_smooth_stairs": "Escalier poli en Scorie", + "block.mineralogy.scoria_smooth_slab": "Dalle polie en Scorie", + "block.mineralogy.scoria_smooth_brick": "Briques polies en Scorie", + "block.mineralogy.scoria_smooth_brick_stairs": "Escalier en briques polies de Scorie", + "block.mineralogy.scoria_smooth_brick_slab": "Dalle en briques polies de Scorie", + "block.mineralogy.scoria_wall": "Muret en Scorie", + "block.mineralogy.scoria_brick_wall": "Muret en briques de Scorie", + "block.mineralogy.scoria_smooth_wall": "Muret poli en Scorie", + "block.mineralogy.scoria_smooth_brick_wall": "Muret en briques polies de Scorie", + "block.mineralogy.scoria_furnace": "Fourneau en Scorie", + "block.mineralogy.scoria_brick_furnace": "Fourneau en briques de Scorie", + "block.mineralogy.scoria_smooth_furnace": "Fourneau poli en Scorie", + "block.mineralogy.scoria_smooth_brick_furnace": "Fourneau en briques polies de Scorie", "block.mineralogy.tuff": "Tuf", - "block.mineralogy.tuff_stairs": "Tuf Escaliers", - "block.mineralogy.tuff_slab": "Tuf Dalle", - "block.mineralogy.tuff_brick": "Tuf Brique", - "block.mineralogy.tuff_brick_stairs": "Tuf Escalier De Brique", - "block.mineralogy.tuff_brick_slab": "Tuf Dalle de brique", - "block.mineralogy.tuff_smooth": "Polished Tuf", - "block.mineralogy.tuff_smooth_stairs": "Tuf Escalier Poli", - "block.mineralogy.tuff_smooth_slab": "Tuf Dalle polie", - "block.mineralogy.tuff_smooth_brick": "Tuf Brique polie", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuf Escalier en brique polie", - "block.mineralogy.tuff_smooth_brick_slab": "Tuf Dalle de brique polie", - "block.mineralogy.tuff_wall": "Tuf Wall", - "block.mineralogy.tuff_brick_wall": "Tuf Mur de briques", - "block.mineralogy.tuff_smooth_wall": "Tuf Mur poli", - "block.mineralogy.tuff_smooth_brick_wall": "Tuf Mur de brique poli", - "block.mineralogy.tuff_furnace": "Tuf Furnace", - "block.mineralogy.tuff_brick_furnace": "Tuf Four à briques", - "block.mineralogy.tuff_smooth_furnace": "Tuf Four poli", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuf Four à brique polie", - "block.mineralogy.siltstone": "Pierre de terre", - "block.mineralogy.siltstone_stairs": "Pierre de terre Escaliers", - "block.mineralogy.siltstone_slab": "Pierre de terre Dalle", - "block.mineralogy.siltstone_brick": "Pierre de terre Brique", - "block.mineralogy.siltstone_brick_stairs": "Pierre de terre Escalier De Brique", - "block.mineralogy.siltstone_brick_slab": "Pierre de terre Dalle de brique", - "block.mineralogy.siltstone_smooth": "Polished Pierre de terre", - "block.mineralogy.siltstone_smooth_stairs": "Pierre de terre Escalier Poli", - "block.mineralogy.siltstone_smooth_slab": "Pierre de terre Dalle polie", - "block.mineralogy.siltstone_smooth_brick": "Pierre de terre Brique polie", - "block.mineralogy.siltstone_smooth_brick_stairs": "Pierre de terre Escalier en brique polie", - "block.mineralogy.siltstone_smooth_brick_slab": "Pierre de terre Dalle de brique polie", - "block.mineralogy.siltstone_wall": "Pierre de terre Wall", - "block.mineralogy.siltstone_brick_wall": "Pierre de terre Mur de briques", - "block.mineralogy.siltstone_smooth_wall": "Pierre de terre Mur poli", - "block.mineralogy.siltstone_smooth_brick_wall": "Pierre de terre Mur de brique poli", - "block.mineralogy.siltstone_furnace": "Pierre de terre Furnace", - "block.mineralogy.siltstone_brick_furnace": "Pierre de terre Four à briques", - "block.mineralogy.siltstone_smooth_furnace": "Pierre de terre Four poli", - "block.mineralogy.siltstone_smooth_brick_furnace": "Pierre de terre Four à brique polie", + "block.mineralogy.tuff_stairs": "Escalier en Tuf", + "block.mineralogy.tuff_slab": "Dalle en Tuf", + "block.mineralogy.tuff_brick": "Briques en Tuf", + "block.mineralogy.tuff_brick_stairs": "Escalier en briques de Tuf", + "block.mineralogy.tuff_brick_slab": "Dalle en briques de Tuf", + "block.mineralogy.tuff_smooth": "Bloc poli en Tuf", + "block.mineralogy.tuff_smooth_stairs": "Escalier poli en Tuf", + "block.mineralogy.tuff_smooth_slab": "Dalle polie en Tuf", + "block.mineralogy.tuff_smooth_brick": "Briques polies en Tuf", + "block.mineralogy.tuff_smooth_brick_stairs": "Escalier en briques polies de Tuf", + "block.mineralogy.tuff_smooth_brick_slab": "Dalle en briques polies de Tuf", + "block.mineralogy.tuff_wall": "Muret en Tuf", + "block.mineralogy.tuff_brick_wall": "Muret en briques de Tuf", + "block.mineralogy.tuff_smooth_wall": "Muret poli en Tuf", + "block.mineralogy.tuff_smooth_brick_wall": "Muret en briques polies de Tuf", + "block.mineralogy.tuff_furnace": "Fourneau en Tuf", + "block.mineralogy.tuff_brick_furnace": "Fourneau en briques de Tuf", + "block.mineralogy.tuff_smooth_furnace": "Fourneau poli en Tuf", + "block.mineralogy.tuff_smooth_brick_furnace": "Fourneau en briques polies de Tuf", + "block.mineralogy.siltstone": "Siltite", + "block.mineralogy.siltstone_stairs": "Escalier en Siltite", + "block.mineralogy.siltstone_slab": "Dalle en Siltite", + "block.mineralogy.siltstone_brick": "Briques en Siltite", + "block.mineralogy.siltstone_brick_stairs": "Escalier en briques de Siltite", + "block.mineralogy.siltstone_brick_slab": "Dalle en briques de Siltite", + "block.mineralogy.siltstone_smooth": "Bloc poli en Siltite", + "block.mineralogy.siltstone_smooth_stairs": "Escalier poli en Siltite", + "block.mineralogy.siltstone_smooth_slab": "Dalle polie en Siltite", + "block.mineralogy.siltstone_smooth_brick": "Briques polies en Siltite", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escalier en briques polies de Siltite", + "block.mineralogy.siltstone_smooth_brick_slab": "Dalle en briques polies de Siltite", + "block.mineralogy.siltstone_wall": "Muret en Siltite", + "block.mineralogy.siltstone_brick_wall": "Muret en briques de Siltite", + "block.mineralogy.siltstone_smooth_wall": "Muret poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_wall": "Muret en briques polies de Siltite", + "block.mineralogy.siltstone_furnace": "Fourneau en Siltite", + "block.mineralogy.siltstone_brick_furnace": "Fourneau en briques de Siltite", + "block.mineralogy.siltstone_smooth_furnace": "Fourneau poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fourneau en briques polies de Siltite", "block.mineralogy.rock_salt": "Sel gemme", - "block.mineralogy.rock_salt_stairs": "Sel gemme Escaliers", - "block.mineralogy.rock_salt_slab": "Sel gemme Dalle", - "block.mineralogy.rock_salt_brick": "Sel gemme Brique", - "block.mineralogy.rock_salt_brick_stairs": "Sel gemme Escalier De Brique", - "block.mineralogy.rock_salt_brick_slab": "Sel gemme Dalle de brique", - "block.mineralogy.rock_salt_smooth": "Polished Sel gemme", - "block.mineralogy.rock_salt_smooth_stairs": "Sel gemme Escalier Poli", - "block.mineralogy.rock_salt_smooth_slab": "Sel gemme Dalle polie", - "block.mineralogy.rock_salt_smooth_brick": "Sel gemme Brique polie", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sel gemme Escalier en brique polie", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sel gemme Dalle de brique polie", - "block.mineralogy.rock_salt_wall": "Sel gemme Wall", - "block.mineralogy.rock_salt_brick_wall": "Sel gemme Mur de briques", - "block.mineralogy.rock_salt_smooth_wall": "Sel gemme Mur poli", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sel gemme Mur de brique poli", - "block.mineralogy.rock_salt_furnace": "Sel gemme Furnace", - "block.mineralogy.rock_salt_brick_furnace": "Sel gemme Four à briques", - "block.mineralogy.rock_salt_smooth_furnace": "Sel gemme Four poli", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sel gemme Four à brique polie", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escaliers", - "block.mineralogy.hornfels_slab": "Hornfels Dalle", - "block.mineralogy.hornfels_brick": "Hornfels Brique", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escalier De Brique", - "block.mineralogy.hornfels_brick_slab": "Hornfels Dalle de brique", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escalier Poli", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Dalle polie", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Brique polie", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Escalier en brique polie", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Dalle de brique polie", - "block.mineralogy.hornfels_wall": "Hornfels Wall", - "block.mineralogy.hornfels_brick_wall": "Hornfels Mur de briques", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Mur poli", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Mur de brique poli", - "block.mineralogy.hornfels_furnace": "Hornfels Furnace", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Four à briques", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Four poli", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Four à brique polie", + "block.mineralogy.rock_salt_stairs": "Escalier en Sel gemme", + "block.mineralogy.rock_salt_slab": "Dalle en Sel gemme", + "block.mineralogy.rock_salt_brick": "Briques en Sel gemme", + "block.mineralogy.rock_salt_brick_stairs": "Escalier en briques de Sel gemme", + "block.mineralogy.rock_salt_brick_slab": "Dalle en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth": "Bloc poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_stairs": "Escalier poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_slab": "Dalle polie en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick": "Briques polies en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escalier en briques polies de Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_slab": "Dalle en briques polies de Sel gemme", + "block.mineralogy.rock_salt_wall": "Muret en Sel gemme", + "block.mineralogy.rock_salt_brick_wall": "Muret en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_wall": "Muret poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muret en briques polies de Sel gemme", + "block.mineralogy.rock_salt_furnace": "Fourneau en Sel gemme", + "block.mineralogy.rock_salt_brick_furnace": "Fourneau en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_furnace": "Fourneau poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fourneau en briques polies de Sel gemme", + "block.mineralogy.hornfels": "Cornéenne", + "block.mineralogy.hornfels_stairs": "Escalier en Cornéenne", + "block.mineralogy.hornfels_slab": "Dalle en Cornéenne", + "block.mineralogy.hornfels_brick": "Briques en Cornéenne", + "block.mineralogy.hornfels_brick_stairs": "Escalier en briques de Cornéenne", + "block.mineralogy.hornfels_brick_slab": "Dalle en briques de Cornéenne", + "block.mineralogy.hornfels_smooth": "Bloc poli en Cornéenne", + "block.mineralogy.hornfels_smooth_stairs": "Escalier poli en Cornéenne", + "block.mineralogy.hornfels_smooth_slab": "Dalle polie en Cornéenne", + "block.mineralogy.hornfels_smooth_brick": "Briques polies en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escalier en briques polies de Cornéenne", + "block.mineralogy.hornfels_smooth_brick_slab": "Dalle en briques polies de Cornéenne", + "block.mineralogy.hornfels_wall": "Muret en Cornéenne", + "block.mineralogy.hornfels_brick_wall": "Muret en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_wall": "Muret poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_wall": "Muret en briques polies de Cornéenne", + "block.mineralogy.hornfels_furnace": "Fourneau en Cornéenne", + "block.mineralogy.hornfels_brick_furnace": "Fourneau en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_furnace": "Fourneau poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fourneau en briques polies de Cornéenne", "block.mineralogy.quartzite": "Quartzite", - "block.mineralogy.quartzite_stairs": "Quartzite Escaliers", - "block.mineralogy.quartzite_slab": "Quartzite Dalle", - "block.mineralogy.quartzite_brick": "Quartzite Brique", - "block.mineralogy.quartzite_brick_stairs": "Quartzite Escalier De Brique", - "block.mineralogy.quartzite_brick_slab": "Quartzite Dalle de brique", - "block.mineralogy.quartzite_smooth": "Polished Quartzite", - "block.mineralogy.quartzite_smooth_stairs": "Quartzite Escalier Poli", - "block.mineralogy.quartzite_smooth_slab": "Quartzite Dalle polie", - "block.mineralogy.quartzite_smooth_brick": "Quartzite Brique polie", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quartzite Escalier en brique polie", - "block.mineralogy.quartzite_smooth_brick_slab": "Quartzite Dalle de brique polie", - "block.mineralogy.quartzite_wall": "Quartzite Wall", - "block.mineralogy.quartzite_brick_wall": "Quartzite Mur de briques", - "block.mineralogy.quartzite_smooth_wall": "Quartzite Mur poli", - "block.mineralogy.quartzite_smooth_brick_wall": "Quartzite Mur de brique poli", - "block.mineralogy.quartzite_furnace": "Quartzite Furnace", - "block.mineralogy.quartzite_brick_furnace": "Quartzite Four à briques", - "block.mineralogy.quartzite_smooth_furnace": "Quartzite Four poli", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quartzite Four à brique polie", + "block.mineralogy.quartzite_stairs": "Escalier en Quartzite", + "block.mineralogy.quartzite_slab": "Dalle en Quartzite", + "block.mineralogy.quartzite_brick": "Briques en Quartzite", + "block.mineralogy.quartzite_brick_stairs": "Escalier en briques de Quartzite", + "block.mineralogy.quartzite_brick_slab": "Dalle en briques de Quartzite", + "block.mineralogy.quartzite_smooth": "Bloc poli en Quartzite", + "block.mineralogy.quartzite_smooth_stairs": "Escalier poli en Quartzite", + "block.mineralogy.quartzite_smooth_slab": "Dalle polie en Quartzite", + "block.mineralogy.quartzite_smooth_brick": "Briques polies en Quartzite", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escalier en briques polies de Quartzite", + "block.mineralogy.quartzite_smooth_brick_slab": "Dalle en briques polies de Quartzite", + "block.mineralogy.quartzite_wall": "Muret en Quartzite", + "block.mineralogy.quartzite_brick_wall": "Muret en briques de Quartzite", + "block.mineralogy.quartzite_smooth_wall": "Muret poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_wall": "Muret en briques polies de Quartzite", + "block.mineralogy.quartzite_furnace": "Fourneau en Quartzite", + "block.mineralogy.quartzite_brick_furnace": "Fourneau en briques de Quartzite", + "block.mineralogy.quartzite_smooth_furnace": "Fourneau poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fourneau en briques polies de Quartzite", "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Escaliers", - "block.mineralogy.novaculite_slab": "Novaculite Dalle", - "block.mineralogy.novaculite_brick": "Novaculite Brique", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Escalier De Brique", - "block.mineralogy.novaculite_brick_slab": "Novaculite Dalle de brique", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Escalier Poli", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Dalle polie", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Brique polie", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Escalier en brique polie", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Dalle de brique polie", - "block.mineralogy.novaculite_wall": "Novaculite Wall", - "block.mineralogy.novaculite_brick_wall": "Novaculite Mur de briques", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Mur poli", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Mur de brique poli", - "block.mineralogy.novaculite_furnace": "Novaculite Furnace", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Four à briques", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Four poli", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Four à brique polie", + "block.mineralogy.novaculite_stairs": "Escalier en Novaculite", + "block.mineralogy.novaculite_slab": "Dalle en Novaculite", + "block.mineralogy.novaculite_brick": "Briques en Novaculite", + "block.mineralogy.novaculite_brick_stairs": "Escalier en briques de Novaculite", + "block.mineralogy.novaculite_brick_slab": "Dalle en briques de Novaculite", + "block.mineralogy.novaculite_smooth": "Bloc poli en Novaculite", + "block.mineralogy.novaculite_smooth_stairs": "Escalier poli en Novaculite", + "block.mineralogy.novaculite_smooth_slab": "Dalle polie en Novaculite", + "block.mineralogy.novaculite_smooth_brick": "Briques polies en Novaculite", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escalier en briques polies de Novaculite", + "block.mineralogy.novaculite_smooth_brick_slab": "Dalle en briques polies de Novaculite", + "block.mineralogy.novaculite_wall": "Muret en Novaculite", + "block.mineralogy.novaculite_brick_wall": "Muret en briques de Novaculite", + "block.mineralogy.novaculite_smooth_wall": "Muret poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_wall": "Muret en briques polies de Novaculite", + "block.mineralogy.novaculite_furnace": "Fourneau en Novaculite", + "block.mineralogy.novaculite_brick_furnace": "Fourneau en briques de Novaculite", + "block.mineralogy.novaculite_smooth_furnace": "Fourneau poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fourneau en briques polies de Novaculite", "block.mineralogy.chalk": "Craie", "item.mineralogy.chalk_dust": "Poudre de craie", "item.mineralogy.salt_dust": "Sel", "item.mineralogy.rock_salt_dust": "Cristaux de sel gemme", - "block.mineralogy.rocksaltlamp": "Lampe à sel", - "block.mineralogy.rocksaltstreetlamp": "Lampadaire à sel", - "block.mineralogy.andesite_relief_axe": "Andésite Soulagement de la hache", - "block.mineralogy.andesite_relief_blank": "Andésite Relief vide", - "block.mineralogy.andesite_relief_cross": "Andésite Relief croisé", - "block.mineralogy.andesite_relief_hammer": "Andésite Soulagement marteau", - "block.mineralogy.andesite_relief_hoe": "Andésite Hoe Relief", - "block.mineralogy.andesite_relief_horizontal": "Andésite Relief horizontal", - "block.mineralogy.andesite_relief_i": "Andésite I Relief", - "block.mineralogy.andesite_relief_left": "Andésite Relief gauche", - "block.mineralogy.andesite_relief_pickaxe": "Andésite Relief de pioche", - "block.mineralogy.andesite_relief_plus": "Andésite Plus de soulagement", - "block.mineralogy.andesite_relief_right": "Andésite Bon soulagement", - "block.mineralogy.andesite_relief_sword": "Andésite Soulagement de l'épée", - "block.mineralogy.andesite_relief_vertical": "Andésite Relief vertical", - "block.mineralogy.basalt_relief_axe": "Basalte Soulagement de la hache", - "block.mineralogy.basalt_relief_blank": "Basalte Relief vide", - "block.mineralogy.basalt_relief_cross": "Basalte Relief croisé", - "block.mineralogy.basalt_relief_hammer": "Basalte Soulagement marteau", - "block.mineralogy.basalt_relief_hoe": "Basalte Hoe Relief", - "block.mineralogy.basalt_relief_horizontal": "Basalte Relief horizontal", - "block.mineralogy.basalt_relief_i": "Basalte I Relief", - "block.mineralogy.basalt_relief_left": "Basalte Relief gauche", - "block.mineralogy.basalt_relief_pickaxe": "Basalte Relief de pioche", - "block.mineralogy.basalt_relief_plus": "Basalte Plus de soulagement", - "block.mineralogy.basalt_relief_right": "Basalte Bon soulagement", - "block.mineralogy.basalt_relief_sword": "Basalte Soulagement de l'épée", - "block.mineralogy.basalt_relief_vertical": "Basalte Relief vertical", - "block.mineralogy.diorite_relief_axe": "Diorite Soulagement de la hache", - "block.mineralogy.diorite_relief_blank": "Diorite Relief vide", - "block.mineralogy.diorite_relief_cross": "Diorite Relief croisé", - "block.mineralogy.diorite_relief_hammer": "Diorite Soulagement marteau", - "block.mineralogy.diorite_relief_hoe": "Diorite Hoe Relief", - "block.mineralogy.diorite_relief_horizontal": "Diorite Relief horizontal", - "block.mineralogy.diorite_relief_i": "Diorite I Relief", - "block.mineralogy.diorite_relief_left": "Diorite Relief gauche", - "block.mineralogy.diorite_relief_pickaxe": "Diorite Relief de pioche", - "block.mineralogy.diorite_relief_plus": "Diorite Plus de soulagement", - "block.mineralogy.diorite_relief_right": "Diorite Bon soulagement", - "block.mineralogy.diorite_relief_sword": "Diorite Soulagement de l'épée", - "block.mineralogy.diorite_relief_vertical": "Diorite Relief vertical", - "block.mineralogy.granite_relief_axe": "Granit Soulagement de la hache", - "block.mineralogy.granite_relief_blank": "Granit Relief vide", - "block.mineralogy.granite_relief_cross": "Granit Relief croisé", - "block.mineralogy.granite_relief_hammer": "Granit Soulagement marteau", - "block.mineralogy.granite_relief_hoe": "Granit Hoe Relief", - "block.mineralogy.granite_relief_horizontal": "Granit Relief horizontal", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief gauche", - "block.mineralogy.granite_relief_pickaxe": "Granit Relief de pioche", - "block.mineralogy.granite_relief_plus": "Granit Plus de soulagement", - "block.mineralogy.granite_relief_right": "Granit Bon soulagement", - "block.mineralogy.granite_relief_sword": "Granit Soulagement de l'épée", - "block.mineralogy.granite_relief_vertical": "Granit Relief vertical", - "block.mineralogy.rhyolite_relief_axe": "Rhyolite Soulagement de la hache", - "block.mineralogy.rhyolite_relief_blank": "Rhyolite Relief vide", - "block.mineralogy.rhyolite_relief_cross": "Rhyolite Relief croisé", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolite Soulagement marteau", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolite Hoe Relief", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolite Relief horizontal", - "block.mineralogy.rhyolite_relief_i": "Rhyolite I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolite Relief gauche", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolite Relief de pioche", - "block.mineralogy.rhyolite_relief_plus": "Rhyolite Plus de soulagement", - "block.mineralogy.rhyolite_relief_right": "Rhyolite Bon soulagement", - "block.mineralogy.rhyolite_relief_sword": "Rhyolite Soulagement de l'épée", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolite Relief vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatite Soulagement de la hache", - "block.mineralogy.pegmatite_relief_blank": "Pegmatite Relief vide", - "block.mineralogy.pegmatite_relief_cross": "Pegmatite Relief croisé", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatite Soulagement marteau", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatite Hoe Relief", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatite Relief horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatite I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatite Relief gauche", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatite Relief de pioche", - "block.mineralogy.pegmatite_relief_plus": "Pegmatite Plus de soulagement", - "block.mineralogy.pegmatite_relief_right": "Pegmatite Bon soulagement", - "block.mineralogy.pegmatite_relief_sword": "Pegmatite Soulagement de l'épée", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatite Relief vertical", - "block.mineralogy.shale_relief_axe": "Schistee argileux Soulagement de la hache", - "block.mineralogy.shale_relief_blank": "Schistee argileux Relief vide", - "block.mineralogy.shale_relief_cross": "Schistee argileux Relief croisé", - "block.mineralogy.shale_relief_hammer": "Schistee argileux Soulagement marteau", - "block.mineralogy.shale_relief_hoe": "Schistee argileux Hoe Relief", - "block.mineralogy.shale_relief_horizontal": "Schistee argileux Relief horizontal", - "block.mineralogy.shale_relief_i": "Schistee argileux I Relief", - "block.mineralogy.shale_relief_left": "Schistee argileux Relief gauche", - "block.mineralogy.shale_relief_pickaxe": "Schistee argileux Relief de pioche", - "block.mineralogy.shale_relief_plus": "Schistee argileux Plus de soulagement", - "block.mineralogy.shale_relief_right": "Schistee argileux Bon soulagement", - "block.mineralogy.shale_relief_sword": "Schistee argileux Soulagement de l'épée", - "block.mineralogy.shale_relief_vertical": "Schistee argileux Relief vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomérat Soulagement de la hache", - "block.mineralogy.conglomerate_relief_blank": "Conglomérat Relief vide", - "block.mineralogy.conglomerate_relief_cross": "Conglomérat Relief croisé", - "block.mineralogy.conglomerate_relief_hammer": "Conglomérat Soulagement marteau", - "block.mineralogy.conglomerate_relief_hoe": "Conglomérat Hoe Relief", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomérat Relief horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomérat I Relief", - "block.mineralogy.conglomerate_relief_left": "Conglomérat Relief gauche", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomérat Relief de pioche", - "block.mineralogy.conglomerate_relief_plus": "Conglomérat Plus de soulagement", - "block.mineralogy.conglomerate_relief_right": "Conglomérat Bon soulagement", - "block.mineralogy.conglomerate_relief_sword": "Conglomérat Soulagement de l'épée", - "block.mineralogy.conglomerate_relief_vertical": "Conglomérat Relief vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomie Soulagement de la hache", - "block.mineralogy.dolomite_relief_blank": "Dolomie Relief vide", - "block.mineralogy.dolomite_relief_cross": "Dolomie Relief croisé", - "block.mineralogy.dolomite_relief_hammer": "Dolomie Soulagement marteau", - "block.mineralogy.dolomite_relief_hoe": "Dolomie Hoe Relief", - "block.mineralogy.dolomite_relief_horizontal": "Dolomie Relief horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomie I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomie Relief gauche", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomie Relief de pioche", - "block.mineralogy.dolomite_relief_plus": "Dolomie Plus de soulagement", - "block.mineralogy.dolomite_relief_right": "Dolomie Bon soulagement", - "block.mineralogy.dolomite_relief_sword": "Dolomie Soulagement de l'épée", - "block.mineralogy.dolomite_relief_vertical": "Dolomie Relief vertical", - "block.mineralogy.limestone_relief_axe": "Calcaire Soulagement de la hache", - "block.mineralogy.limestone_relief_blank": "Calcaire Relief vide", - "block.mineralogy.limestone_relief_cross": "Calcaire Relief croisé", - "block.mineralogy.limestone_relief_hammer": "Calcaire Soulagement marteau", - "block.mineralogy.limestone_relief_hoe": "Calcaire Hoe Relief", - "block.mineralogy.limestone_relief_horizontal": "Calcaire Relief horizontal", - "block.mineralogy.limestone_relief_i": "Calcaire I Relief", - "block.mineralogy.limestone_relief_left": "Calcaire Relief gauche", - "block.mineralogy.limestone_relief_pickaxe": "Calcaire Relief de pioche", - "block.mineralogy.limestone_relief_plus": "Calcaire Plus de soulagement", - "block.mineralogy.limestone_relief_right": "Calcaire Bon soulagement", - "block.mineralogy.limestone_relief_sword": "Calcaire Soulagement de l'épée", - "block.mineralogy.limestone_relief_vertical": "Calcaire Relief vertical", - "block.mineralogy.marble_relief_axe": "Marbre Soulagement de la hache", - "block.mineralogy.marble_relief_blank": "Marbre Relief vide", - "block.mineralogy.marble_relief_cross": "Marbre Relief croisé", - "block.mineralogy.marble_relief_hammer": "Marbre Soulagement marteau", - "block.mineralogy.marble_relief_hoe": "Marbre Hoe Relief", - "block.mineralogy.marble_relief_horizontal": "Marbre Relief horizontal", - "block.mineralogy.marble_relief_i": "Marbre I Relief", - "block.mineralogy.marble_relief_left": "Marbre Relief gauche", - "block.mineralogy.marble_relief_pickaxe": "Marbre Relief de pioche", - "block.mineralogy.marble_relief_plus": "Marbre Plus de soulagement", - "block.mineralogy.marble_relief_right": "Marbre Bon soulagement", - "block.mineralogy.marble_relief_sword": "Marbre Soulagement de l'épée", - "block.mineralogy.marble_relief_vertical": "Marbre Relief vertical", - "block.mineralogy.slate_relief_axe": "Ardoise Soulagement de la hache", - "block.mineralogy.slate_relief_blank": "Ardoise Relief vide", - "block.mineralogy.slate_relief_cross": "Ardoise Relief croisé", - "block.mineralogy.slate_relief_hammer": "Ardoise Soulagement marteau", - "block.mineralogy.slate_relief_hoe": "Ardoise Hoe Relief", - "block.mineralogy.slate_relief_horizontal": "Ardoise Relief horizontal", - "block.mineralogy.slate_relief_i": "Ardoise I Relief", - "block.mineralogy.slate_relief_left": "Ardoise Relief gauche", - "block.mineralogy.slate_relief_pickaxe": "Ardoise Relief de pioche", - "block.mineralogy.slate_relief_plus": "Ardoise Plus de soulagement", - "block.mineralogy.slate_relief_right": "Ardoise Bon soulagement", - "block.mineralogy.slate_relief_sword": "Ardoise Soulagement de l'épée", - "block.mineralogy.slate_relief_vertical": "Ardoise Relief vertical", - "block.mineralogy.schist_relief_axe": "Schiste Soulagement de la hache", - "block.mineralogy.schist_relief_blank": "Schiste Relief vide", - "block.mineralogy.schist_relief_cross": "Schiste Relief croisé", - "block.mineralogy.schist_relief_hammer": "Schiste Soulagement marteau", - "block.mineralogy.schist_relief_hoe": "Schiste Hoe Relief", - "block.mineralogy.schist_relief_horizontal": "Schiste Relief horizontal", - "block.mineralogy.schist_relief_i": "Schiste I Relief", - "block.mineralogy.schist_relief_left": "Schiste Relief gauche", - "block.mineralogy.schist_relief_pickaxe": "Schiste Relief de pioche", - "block.mineralogy.schist_relief_plus": "Schiste Plus de soulagement", - "block.mineralogy.schist_relief_right": "Schiste Bon soulagement", - "block.mineralogy.schist_relief_sword": "Schiste Soulagement de l'épée", - "block.mineralogy.schist_relief_vertical": "Schiste Relief vertical", - "block.mineralogy.gneiss_relief_axe": "Gneiss Soulagement de la hache", - "block.mineralogy.gneiss_relief_blank": "Gneiss Relief vide", - "block.mineralogy.gneiss_relief_cross": "Gneiss Relief croisé", - "block.mineralogy.gneiss_relief_hammer": "Gneiss Soulagement marteau", - "block.mineralogy.gneiss_relief_hoe": "Gneiss Hoe Relief", - "block.mineralogy.gneiss_relief_horizontal": "Gneiss Relief horizontal", - "block.mineralogy.gneiss_relief_i": "Gneiss I Relief", - "block.mineralogy.gneiss_relief_left": "Gneiss Relief gauche", - "block.mineralogy.gneiss_relief_pickaxe": "Gneiss Relief de pioche", - "block.mineralogy.gneiss_relief_plus": "Gneiss Plus de soulagement", - "block.mineralogy.gneiss_relief_right": "Gneiss Bon soulagement", - "block.mineralogy.gneiss_relief_sword": "Gneiss Soulagement de l'épée", - "block.mineralogy.gneiss_relief_vertical": "Gneiss Relief vertical", - "block.mineralogy.phyllite_relief_axe": "Phyllite Soulagement de la hache", - "block.mineralogy.phyllite_relief_blank": "Phyllite Relief vide", - "block.mineralogy.phyllite_relief_cross": "Phyllite Relief croisé", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Soulagement marteau", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hoe Relief", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Relief horizontal", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief gauche", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Relief de pioche", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus de soulagement", - "block.mineralogy.phyllite_relief_right": "Phyllite Bon soulagement", - "block.mineralogy.phyllite_relief_sword": "Phyllite Soulagement de l'épée", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Relief vertical", - "block.mineralogy.amphibolite_relief_axe": "Amphibolite Soulagement de la hache", - "block.mineralogy.amphibolite_relief_blank": "Amphibolite Relief vide", - "block.mineralogy.amphibolite_relief_cross": "Amphibolite Relief croisé", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolite Soulagement marteau", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolite Hoe Relief", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolite Relief horizontal", - "block.mineralogy.amphibolite_relief_i": "Amphibolite I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolite Relief gauche", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolite Relief de pioche", - "block.mineralogy.amphibolite_relief_plus": "Amphibolite Plus de soulagement", - "block.mineralogy.amphibolite_relief_right": "Amphibolite Bon soulagement", - "block.mineralogy.amphibolite_relief_sword": "Amphibolite Soulagement de l'épée", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolite Relief vertical", - "block.mineralogy.diabase_relief_axe": "Diabase Soulagement de la hache", - "block.mineralogy.diabase_relief_blank": "Diabase Relief vide", - "block.mineralogy.diabase_relief_cross": "Diabase Relief croisé", - "block.mineralogy.diabase_relief_hammer": "Diabase Soulagement marteau", - "block.mineralogy.diabase_relief_hoe": "Diabase Hoe Relief", - "block.mineralogy.diabase_relief_horizontal": "Diabase Relief horizontal", - "block.mineralogy.diabase_relief_i": "Diabase I Relief", - "block.mineralogy.diabase_relief_left": "Diabase Relief gauche", - "block.mineralogy.diabase_relief_pickaxe": "Diabase Relief de pioche", - "block.mineralogy.diabase_relief_plus": "Diabase Plus de soulagement", - "block.mineralogy.diabase_relief_right": "Diabase Bon soulagement", - "block.mineralogy.diabase_relief_sword": "Diabase Soulagement de l'épée", - "block.mineralogy.diabase_relief_vertical": "Diabase Relief vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Soulagement de la hache", - "block.mineralogy.gabbro_relief_blank": "Gabbro Relief vide", - "block.mineralogy.gabbro_relief_cross": "Gabbro Relief croisé", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Soulagement marteau", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hoe Relief", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Relief horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief gauche", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Relief de pioche", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus de soulagement", - "block.mineralogy.gabbro_relief_right": "Gabbro Bon soulagement", - "block.mineralogy.gabbro_relief_sword": "Gabbro Soulagement de l'épée", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Relief vertical", - "block.mineralogy.peridotite_relief_axe": "Péridotite Soulagement de la hache", - "block.mineralogy.peridotite_relief_blank": "Péridotite Relief vide", - "block.mineralogy.peridotite_relief_cross": "Péridotite Relief croisé", - "block.mineralogy.peridotite_relief_hammer": "Péridotite Soulagement marteau", - "block.mineralogy.peridotite_relief_hoe": "Péridotite Hoe Relief", - "block.mineralogy.peridotite_relief_horizontal": "Péridotite Relief horizontal", - "block.mineralogy.peridotite_relief_i": "Péridotite I Relief", - "block.mineralogy.peridotite_relief_left": "Péridotite Relief gauche", - "block.mineralogy.peridotite_relief_pickaxe": "Péridotite Relief de pioche", - "block.mineralogy.peridotite_relief_plus": "Péridotite Plus de soulagement", - "block.mineralogy.peridotite_relief_right": "Péridotite Bon soulagement", - "block.mineralogy.peridotite_relief_sword": "Péridotite Soulagement de l'épée", - "block.mineralogy.peridotite_relief_vertical": "Péridotite Relief vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Verre basaltique Soulagement de la hache", - "block.mineralogy.basaltic_glass_relief_blank": "Verre basaltique Relief vide", - "block.mineralogy.basaltic_glass_relief_cross": "Verre basaltique Relief croisé", - "block.mineralogy.basaltic_glass_relief_hammer": "Verre basaltique Soulagement marteau", - "block.mineralogy.basaltic_glass_relief_hoe": "Verre basaltique Hoe Relief", - "block.mineralogy.basaltic_glass_relief_horizontal": "Verre basaltique Relief horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Verre basaltique I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Verre basaltique Relief gauche", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Verre basaltique Relief de pioche", - "block.mineralogy.basaltic_glass_relief_plus": "Verre basaltique Plus de soulagement", - "block.mineralogy.basaltic_glass_relief_right": "Verre basaltique Bon soulagement", - "block.mineralogy.basaltic_glass_relief_sword": "Verre basaltique Soulagement de l'épée", - "block.mineralogy.basaltic_glass_relief_vertical": "Verre basaltique Relief vertical", - "block.mineralogy.scoria_relief_axe": "Scories Soulagement de la hache", - "block.mineralogy.scoria_relief_blank": "Scories Relief vide", - "block.mineralogy.scoria_relief_cross": "Scories Relief croisé", - "block.mineralogy.scoria_relief_hammer": "Scories Soulagement marteau", - "block.mineralogy.scoria_relief_hoe": "Scories Hoe Relief", - "block.mineralogy.scoria_relief_horizontal": "Scories Relief horizontal", - "block.mineralogy.scoria_relief_i": "Scories I Relief", - "block.mineralogy.scoria_relief_left": "Scories Relief gauche", - "block.mineralogy.scoria_relief_pickaxe": "Scories Relief de pioche", - "block.mineralogy.scoria_relief_plus": "Scories Plus de soulagement", - "block.mineralogy.scoria_relief_right": "Scories Bon soulagement", - "block.mineralogy.scoria_relief_sword": "Scories Soulagement de l'épée", - "block.mineralogy.scoria_relief_vertical": "Scories Relief vertical", - "block.mineralogy.tuff_relief_axe": "Tuf Soulagement de la hache", - "block.mineralogy.tuff_relief_blank": "Tuf Relief vide", - "block.mineralogy.tuff_relief_cross": "Tuf Relief croisé", - "block.mineralogy.tuff_relief_hammer": "Tuf Soulagement marteau", - "block.mineralogy.tuff_relief_hoe": "Tuf Hoe Relief", - "block.mineralogy.tuff_relief_horizontal": "Tuf Relief horizontal", - "block.mineralogy.tuff_relief_i": "Tuf I Relief", - "block.mineralogy.tuff_relief_left": "Tuf Relief gauche", - "block.mineralogy.tuff_relief_pickaxe": "Tuf Relief de pioche", - "block.mineralogy.tuff_relief_plus": "Tuf Plus de soulagement", - "block.mineralogy.tuff_relief_right": "Tuf Bon soulagement", - "block.mineralogy.tuff_relief_sword": "Tuf Soulagement de l'épée", - "block.mineralogy.tuff_relief_vertical": "Tuf Relief vertical", - "block.mineralogy.siltstone_relief_axe": "Pierre de terre Soulagement de la hache", - "block.mineralogy.siltstone_relief_blank": "Pierre de terre Relief vide", - "block.mineralogy.siltstone_relief_cross": "Pierre de terre Relief croisé", - "block.mineralogy.siltstone_relief_hammer": "Pierre de terre Soulagement marteau", - "block.mineralogy.siltstone_relief_hoe": "Pierre de terre Hoe Relief", - "block.mineralogy.siltstone_relief_horizontal": "Pierre de terre Relief horizontal", - "block.mineralogy.siltstone_relief_i": "Pierre de terre I Relief", - "block.mineralogy.siltstone_relief_left": "Pierre de terre Relief gauche", - "block.mineralogy.siltstone_relief_pickaxe": "Pierre de terre Relief de pioche", - "block.mineralogy.siltstone_relief_plus": "Pierre de terre Plus de soulagement", - "block.mineralogy.siltstone_relief_right": "Pierre de terre Bon soulagement", - "block.mineralogy.siltstone_relief_sword": "Pierre de terre Soulagement de l'épée", - "block.mineralogy.siltstone_relief_vertical": "Pierre de terre Relief vertical", - "block.mineralogy.rock_salt_relief_axe": "Sel gemme Soulagement de la hache", - "block.mineralogy.rock_salt_relief_blank": "Sel gemme Relief vide", - "block.mineralogy.rock_salt_relief_cross": "Sel gemme Relief croisé", - "block.mineralogy.rock_salt_relief_hammer": "Sel gemme Soulagement marteau", - "block.mineralogy.rock_salt_relief_hoe": "Sel gemme Hoe Relief", - "block.mineralogy.rock_salt_relief_horizontal": "Sel gemme Relief horizontal", - "block.mineralogy.rock_salt_relief_i": "Sel gemme I Relief", - "block.mineralogy.rock_salt_relief_left": "Sel gemme Relief gauche", - "block.mineralogy.rock_salt_relief_pickaxe": "Sel gemme Relief de pioche", - "block.mineralogy.rock_salt_relief_plus": "Sel gemme Plus de soulagement", - "block.mineralogy.rock_salt_relief_right": "Sel gemme Bon soulagement", - "block.mineralogy.rock_salt_relief_sword": "Sel gemme Soulagement de l'épée", - "block.mineralogy.rock_salt_relief_vertical": "Sel gemme Relief vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Soulagement de la hache", - "block.mineralogy.hornfels_relief_blank": "Hornfels Relief vide", - "block.mineralogy.hornfels_relief_cross": "Hornfels Relief croisé", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Soulagement marteau", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hoe Relief", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Relief horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief gauche", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Relief de pioche", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus de soulagement", - "block.mineralogy.hornfels_relief_right": "Hornfels Bon soulagement", - "block.mineralogy.hornfels_relief_sword": "Hornfels Soulagement de l'épée", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Relief vertical", - "block.mineralogy.quartzite_relief_axe": "Quartzite Soulagement de la hache", - "block.mineralogy.quartzite_relief_blank": "Quartzite Relief vide", - "block.mineralogy.quartzite_relief_cross": "Quartzite Relief croisé", - "block.mineralogy.quartzite_relief_hammer": "Quartzite Soulagement marteau", - "block.mineralogy.quartzite_relief_hoe": "Quartzite Hoe Relief", - "block.mineralogy.quartzite_relief_horizontal": "Quartzite Relief horizontal", - "block.mineralogy.quartzite_relief_i": "Quartzite I Relief", - "block.mineralogy.quartzite_relief_left": "Quartzite Relief gauche", - "block.mineralogy.quartzite_relief_pickaxe": "Quartzite Relief de pioche", - "block.mineralogy.quartzite_relief_plus": "Quartzite Plus de soulagement", - "block.mineralogy.quartzite_relief_right": "Quartzite Bon soulagement", - "block.mineralogy.quartzite_relief_sword": "Quartzite Soulagement de l'épée", - "block.mineralogy.quartzite_relief_vertical": "Quartzite Relief vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculite Soulagement de la hache", - "block.mineralogy.novaculite_relief_blank": "Novaculite Relief vide", - "block.mineralogy.novaculite_relief_cross": "Novaculite Relief croisé", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Soulagement marteau", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hoe Relief", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Relief horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief gauche", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Relief de pioche", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus de soulagement", - "block.mineralogy.novaculite_relief_right": "Novaculite Bon soulagement", - "block.mineralogy.novaculite_relief_sword": "Novaculite Soulagement de l'épée", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Relief vertical", - "advancements.mineralogy.all_the_rocks.title": "Appelez les rochers Ludo !", - "advancements.mineralogy.all_the_rocks.description": "Wow, vous avez trouvé tous les types de roches standards en minéralogie !", - "fluid.mineralogy.crude_oil": "Pétrole brut", - "block.mineralogy.crude_oil": "Pétrole brut", - "item.mineralogy.crude_oil_bucket": "Seau de pétrole brut", + "block.mineralogy.rocksaltlamp": "Lampe en sel gemme", + "block.mineralogy.rocksaltstreetlamp": "Réverbère en sel gemme", + "block.mineralogy.andesite_relief_axe": "Bas-relief en Andésite (hache)", + "block.mineralogy.andesite_relief_blank": "Bas-relief en Andésite (sans motif)", + "block.mineralogy.andesite_relief_cross": "Bas-relief en Andésite (croix)", + "block.mineralogy.andesite_relief_hammer": "Bas-relief en Andésite (marteau)", + "block.mineralogy.andesite_relief_hoe": "Bas-relief en Andésite (houe)", + "block.mineralogy.andesite_relief_horizontal": "Bas-relief en Andésite (horizontal)", + "block.mineralogy.andesite_relief_i": "Bas-relief en Andésite (I)", + "block.mineralogy.andesite_relief_left": "Bas-relief en Andésite (gauche)", + "block.mineralogy.andesite_relief_pickaxe": "Bas-relief en Andésite (pioche)", + "block.mineralogy.andesite_relief_plus": "Bas-relief en Andésite (signe plus)", + "block.mineralogy.andesite_relief_right": "Bas-relief en Andésite (droite)", + "block.mineralogy.andesite_relief_sword": "Bas-relief en Andésite (épée)", + "block.mineralogy.andesite_relief_vertical": "Bas-relief en Andésite (vertical)", + "block.mineralogy.basalt_relief_axe": "Bas-relief en Basalte (hache)", + "block.mineralogy.basalt_relief_blank": "Bas-relief en Basalte (sans motif)", + "block.mineralogy.basalt_relief_cross": "Bas-relief en Basalte (croix)", + "block.mineralogy.basalt_relief_hammer": "Bas-relief en Basalte (marteau)", + "block.mineralogy.basalt_relief_hoe": "Bas-relief en Basalte (houe)", + "block.mineralogy.basalt_relief_horizontal": "Bas-relief en Basalte (horizontal)", + "block.mineralogy.basalt_relief_i": "Bas-relief en Basalte (I)", + "block.mineralogy.basalt_relief_left": "Bas-relief en Basalte (gauche)", + "block.mineralogy.basalt_relief_pickaxe": "Bas-relief en Basalte (pioche)", + "block.mineralogy.basalt_relief_plus": "Bas-relief en Basalte (signe plus)", + "block.mineralogy.basalt_relief_right": "Bas-relief en Basalte (droite)", + "block.mineralogy.basalt_relief_sword": "Bas-relief en Basalte (épée)", + "block.mineralogy.basalt_relief_vertical": "Bas-relief en Basalte (vertical)", + "block.mineralogy.diorite_relief_axe": "Bas-relief en Diorite (hache)", + "block.mineralogy.diorite_relief_blank": "Bas-relief en Diorite (sans motif)", + "block.mineralogy.diorite_relief_cross": "Bas-relief en Diorite (croix)", + "block.mineralogy.diorite_relief_hammer": "Bas-relief en Diorite (marteau)", + "block.mineralogy.diorite_relief_hoe": "Bas-relief en Diorite (houe)", + "block.mineralogy.diorite_relief_horizontal": "Bas-relief en Diorite (horizontal)", + "block.mineralogy.diorite_relief_i": "Bas-relief en Diorite (I)", + "block.mineralogy.diorite_relief_left": "Bas-relief en Diorite (gauche)", + "block.mineralogy.diorite_relief_pickaxe": "Bas-relief en Diorite (pioche)", + "block.mineralogy.diorite_relief_plus": "Bas-relief en Diorite (signe plus)", + "block.mineralogy.diorite_relief_right": "Bas-relief en Diorite (droite)", + "block.mineralogy.diorite_relief_sword": "Bas-relief en Diorite (épée)", + "block.mineralogy.diorite_relief_vertical": "Bas-relief en Diorite (vertical)", + "block.mineralogy.granite_relief_axe": "Bas-relief en Granite (hache)", + "block.mineralogy.granite_relief_blank": "Bas-relief en Granite (sans motif)", + "block.mineralogy.granite_relief_cross": "Bas-relief en Granite (croix)", + "block.mineralogy.granite_relief_hammer": "Bas-relief en Granite (marteau)", + "block.mineralogy.granite_relief_hoe": "Bas-relief en Granite (houe)", + "block.mineralogy.granite_relief_horizontal": "Bas-relief en Granite (horizontal)", + "block.mineralogy.granite_relief_i": "Bas-relief en Granite (I)", + "block.mineralogy.granite_relief_left": "Bas-relief en Granite (gauche)", + "block.mineralogy.granite_relief_pickaxe": "Bas-relief en Granite (pioche)", + "block.mineralogy.granite_relief_plus": "Bas-relief en Granite (signe plus)", + "block.mineralogy.granite_relief_right": "Bas-relief en Granite (droite)", + "block.mineralogy.granite_relief_sword": "Bas-relief en Granite (épée)", + "block.mineralogy.granite_relief_vertical": "Bas-relief en Granite (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Bas-relief en Rhyolite (hache)", + "block.mineralogy.rhyolite_relief_blank": "Bas-relief en Rhyolite (sans motif)", + "block.mineralogy.rhyolite_relief_cross": "Bas-relief en Rhyolite (croix)", + "block.mineralogy.rhyolite_relief_hammer": "Bas-relief en Rhyolite (marteau)", + "block.mineralogy.rhyolite_relief_hoe": "Bas-relief en Rhyolite (houe)", + "block.mineralogy.rhyolite_relief_horizontal": "Bas-relief en Rhyolite (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Bas-relief en Rhyolite (I)", + "block.mineralogy.rhyolite_relief_left": "Bas-relief en Rhyolite (gauche)", + "block.mineralogy.rhyolite_relief_pickaxe": "Bas-relief en Rhyolite (pioche)", + "block.mineralogy.rhyolite_relief_plus": "Bas-relief en Rhyolite (signe plus)", + "block.mineralogy.rhyolite_relief_right": "Bas-relief en Rhyolite (droite)", + "block.mineralogy.rhyolite_relief_sword": "Bas-relief en Rhyolite (épée)", + "block.mineralogy.rhyolite_relief_vertical": "Bas-relief en Rhyolite (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Bas-relief en Pegmatite (hache)", + "block.mineralogy.pegmatite_relief_blank": "Bas-relief en Pegmatite (sans motif)", + "block.mineralogy.pegmatite_relief_cross": "Bas-relief en Pegmatite (croix)", + "block.mineralogy.pegmatite_relief_hammer": "Bas-relief en Pegmatite (marteau)", + "block.mineralogy.pegmatite_relief_hoe": "Bas-relief en Pegmatite (houe)", + "block.mineralogy.pegmatite_relief_horizontal": "Bas-relief en Pegmatite (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Bas-relief en Pegmatite (I)", + "block.mineralogy.pegmatite_relief_left": "Bas-relief en Pegmatite (gauche)", + "block.mineralogy.pegmatite_relief_pickaxe": "Bas-relief en Pegmatite (pioche)", + "block.mineralogy.pegmatite_relief_plus": "Bas-relief en Pegmatite (signe plus)", + "block.mineralogy.pegmatite_relief_right": "Bas-relief en Pegmatite (droite)", + "block.mineralogy.pegmatite_relief_sword": "Bas-relief en Pegmatite (épée)", + "block.mineralogy.pegmatite_relief_vertical": "Bas-relief en Pegmatite (vertical)", + "block.mineralogy.shale_relief_axe": "Bas-relief en Schiste argileux (hache)", + "block.mineralogy.shale_relief_blank": "Bas-relief en Schiste argileux (sans motif)", + "block.mineralogy.shale_relief_cross": "Bas-relief en Schiste argileux (croix)", + "block.mineralogy.shale_relief_hammer": "Bas-relief en Schiste argileux (marteau)", + "block.mineralogy.shale_relief_hoe": "Bas-relief en Schiste argileux (houe)", + "block.mineralogy.shale_relief_horizontal": "Bas-relief en Schiste argileux (horizontal)", + "block.mineralogy.shale_relief_i": "Bas-relief en Schiste argileux (I)", + "block.mineralogy.shale_relief_left": "Bas-relief en Schiste argileux (gauche)", + "block.mineralogy.shale_relief_pickaxe": "Bas-relief en Schiste argileux (pioche)", + "block.mineralogy.shale_relief_plus": "Bas-relief en Schiste argileux (signe plus)", + "block.mineralogy.shale_relief_right": "Bas-relief en Schiste argileux (droite)", + "block.mineralogy.shale_relief_sword": "Bas-relief en Schiste argileux (épée)", + "block.mineralogy.shale_relief_vertical": "Bas-relief en Schiste argileux (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Bas-relief en Conglomérat (hache)", + "block.mineralogy.conglomerate_relief_blank": "Bas-relief en Conglomérat (sans motif)", + "block.mineralogy.conglomerate_relief_cross": "Bas-relief en Conglomérat (croix)", + "block.mineralogy.conglomerate_relief_hammer": "Bas-relief en Conglomérat (marteau)", + "block.mineralogy.conglomerate_relief_hoe": "Bas-relief en Conglomérat (houe)", + "block.mineralogy.conglomerate_relief_horizontal": "Bas-relief en Conglomérat (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Bas-relief en Conglomérat (I)", + "block.mineralogy.conglomerate_relief_left": "Bas-relief en Conglomérat (gauche)", + "block.mineralogy.conglomerate_relief_pickaxe": "Bas-relief en Conglomérat (pioche)", + "block.mineralogy.conglomerate_relief_plus": "Bas-relief en Conglomérat (signe plus)", + "block.mineralogy.conglomerate_relief_right": "Bas-relief en Conglomérat (droite)", + "block.mineralogy.conglomerate_relief_sword": "Bas-relief en Conglomérat (épée)", + "block.mineralogy.conglomerate_relief_vertical": "Bas-relief en Conglomérat (vertical)", + "block.mineralogy.dolomite_relief_axe": "Bas-relief en Dolomie (hache)", + "block.mineralogy.dolomite_relief_blank": "Bas-relief en Dolomie (sans motif)", + "block.mineralogy.dolomite_relief_cross": "Bas-relief en Dolomie (croix)", + "block.mineralogy.dolomite_relief_hammer": "Bas-relief en Dolomie (marteau)", + "block.mineralogy.dolomite_relief_hoe": "Bas-relief en Dolomie (houe)", + "block.mineralogy.dolomite_relief_horizontal": "Bas-relief en Dolomie (horizontal)", + "block.mineralogy.dolomite_relief_i": "Bas-relief en Dolomie (I)", + "block.mineralogy.dolomite_relief_left": "Bas-relief en Dolomie (gauche)", + "block.mineralogy.dolomite_relief_pickaxe": "Bas-relief en Dolomie (pioche)", + "block.mineralogy.dolomite_relief_plus": "Bas-relief en Dolomie (signe plus)", + "block.mineralogy.dolomite_relief_right": "Bas-relief en Dolomie (droite)", + "block.mineralogy.dolomite_relief_sword": "Bas-relief en Dolomie (épée)", + "block.mineralogy.dolomite_relief_vertical": "Bas-relief en Dolomie (vertical)", + "block.mineralogy.limestone_relief_axe": "Bas-relief en Calcaire (hache)", + "block.mineralogy.limestone_relief_blank": "Bas-relief en Calcaire (sans motif)", + "block.mineralogy.limestone_relief_cross": "Bas-relief en Calcaire (croix)", + "block.mineralogy.limestone_relief_hammer": "Bas-relief en Calcaire (marteau)", + "block.mineralogy.limestone_relief_hoe": "Bas-relief en Calcaire (houe)", + "block.mineralogy.limestone_relief_horizontal": "Bas-relief en Calcaire (horizontal)", + "block.mineralogy.limestone_relief_i": "Bas-relief en Calcaire (I)", + "block.mineralogy.limestone_relief_left": "Bas-relief en Calcaire (gauche)", + "block.mineralogy.limestone_relief_pickaxe": "Bas-relief en Calcaire (pioche)", + "block.mineralogy.limestone_relief_plus": "Bas-relief en Calcaire (signe plus)", + "block.mineralogy.limestone_relief_right": "Bas-relief en Calcaire (droite)", + "block.mineralogy.limestone_relief_sword": "Bas-relief en Calcaire (épée)", + "block.mineralogy.limestone_relief_vertical": "Bas-relief en Calcaire (vertical)", + "block.mineralogy.marble_relief_axe": "Bas-relief en Marbre (hache)", + "block.mineralogy.marble_relief_blank": "Bas-relief en Marbre (sans motif)", + "block.mineralogy.marble_relief_cross": "Bas-relief en Marbre (croix)", + "block.mineralogy.marble_relief_hammer": "Bas-relief en Marbre (marteau)", + "block.mineralogy.marble_relief_hoe": "Bas-relief en Marbre (houe)", + "block.mineralogy.marble_relief_horizontal": "Bas-relief en Marbre (horizontal)", + "block.mineralogy.marble_relief_i": "Bas-relief en Marbre (I)", + "block.mineralogy.marble_relief_left": "Bas-relief en Marbre (gauche)", + "block.mineralogy.marble_relief_pickaxe": "Bas-relief en Marbre (pioche)", + "block.mineralogy.marble_relief_plus": "Bas-relief en Marbre (signe plus)", + "block.mineralogy.marble_relief_right": "Bas-relief en Marbre (droite)", + "block.mineralogy.marble_relief_sword": "Bas-relief en Marbre (épée)", + "block.mineralogy.marble_relief_vertical": "Bas-relief en Marbre (vertical)", + "block.mineralogy.slate_relief_axe": "Bas-relief en Ardoise (hache)", + "block.mineralogy.slate_relief_blank": "Bas-relief en Ardoise (sans motif)", + "block.mineralogy.slate_relief_cross": "Bas-relief en Ardoise (croix)", + "block.mineralogy.slate_relief_hammer": "Bas-relief en Ardoise (marteau)", + "block.mineralogy.slate_relief_hoe": "Bas-relief en Ardoise (houe)", + "block.mineralogy.slate_relief_horizontal": "Bas-relief en Ardoise (horizontal)", + "block.mineralogy.slate_relief_i": "Bas-relief en Ardoise (I)", + "block.mineralogy.slate_relief_left": "Bas-relief en Ardoise (gauche)", + "block.mineralogy.slate_relief_pickaxe": "Bas-relief en Ardoise (pioche)", + "block.mineralogy.slate_relief_plus": "Bas-relief en Ardoise (signe plus)", + "block.mineralogy.slate_relief_right": "Bas-relief en Ardoise (droite)", + "block.mineralogy.slate_relief_sword": "Bas-relief en Ardoise (épée)", + "block.mineralogy.slate_relief_vertical": "Bas-relief en Ardoise (vertical)", + "block.mineralogy.schist_relief_axe": "Bas-relief en Micaschiste (hache)", + "block.mineralogy.schist_relief_blank": "Bas-relief en Micaschiste (sans motif)", + "block.mineralogy.schist_relief_cross": "Bas-relief en Micaschiste (croix)", + "block.mineralogy.schist_relief_hammer": "Bas-relief en Micaschiste (marteau)", + "block.mineralogy.schist_relief_hoe": "Bas-relief en Micaschiste (houe)", + "block.mineralogy.schist_relief_horizontal": "Bas-relief en Micaschiste (horizontal)", + "block.mineralogy.schist_relief_i": "Bas-relief en Micaschiste (I)", + "block.mineralogy.schist_relief_left": "Bas-relief en Micaschiste (gauche)", + "block.mineralogy.schist_relief_pickaxe": "Bas-relief en Micaschiste (pioche)", + "block.mineralogy.schist_relief_plus": "Bas-relief en Micaschiste (signe plus)", + "block.mineralogy.schist_relief_right": "Bas-relief en Micaschiste (droite)", + "block.mineralogy.schist_relief_sword": "Bas-relief en Micaschiste (épée)", + "block.mineralogy.schist_relief_vertical": "Bas-relief en Micaschiste (vertical)", + "block.mineralogy.gneiss_relief_axe": "Bas-relief en Gneiss (hache)", + "block.mineralogy.gneiss_relief_blank": "Bas-relief en Gneiss (sans motif)", + "block.mineralogy.gneiss_relief_cross": "Bas-relief en Gneiss (croix)", + "block.mineralogy.gneiss_relief_hammer": "Bas-relief en Gneiss (marteau)", + "block.mineralogy.gneiss_relief_hoe": "Bas-relief en Gneiss (houe)", + "block.mineralogy.gneiss_relief_horizontal": "Bas-relief en Gneiss (horizontal)", + "block.mineralogy.gneiss_relief_i": "Bas-relief en Gneiss (I)", + "block.mineralogy.gneiss_relief_left": "Bas-relief en Gneiss (gauche)", + "block.mineralogy.gneiss_relief_pickaxe": "Bas-relief en Gneiss (pioche)", + "block.mineralogy.gneiss_relief_plus": "Bas-relief en Gneiss (signe plus)", + "block.mineralogy.gneiss_relief_right": "Bas-relief en Gneiss (droite)", + "block.mineralogy.gneiss_relief_sword": "Bas-relief en Gneiss (épée)", + "block.mineralogy.gneiss_relief_vertical": "Bas-relief en Gneiss (vertical)", + "block.mineralogy.phyllite_relief_axe": "Bas-relief en Phyllade (hache)", + "block.mineralogy.phyllite_relief_blank": "Bas-relief en Phyllade (sans motif)", + "block.mineralogy.phyllite_relief_cross": "Bas-relief en Phyllade (croix)", + "block.mineralogy.phyllite_relief_hammer": "Bas-relief en Phyllade (marteau)", + "block.mineralogy.phyllite_relief_hoe": "Bas-relief en Phyllade (houe)", + "block.mineralogy.phyllite_relief_horizontal": "Bas-relief en Phyllade (horizontal)", + "block.mineralogy.phyllite_relief_i": "Bas-relief en Phyllade (I)", + "block.mineralogy.phyllite_relief_left": "Bas-relief en Phyllade (gauche)", + "block.mineralogy.phyllite_relief_pickaxe": "Bas-relief en Phyllade (pioche)", + "block.mineralogy.phyllite_relief_plus": "Bas-relief en Phyllade (signe plus)", + "block.mineralogy.phyllite_relief_right": "Bas-relief en Phyllade (droite)", + "block.mineralogy.phyllite_relief_sword": "Bas-relief en Phyllade (épée)", + "block.mineralogy.phyllite_relief_vertical": "Bas-relief en Phyllade (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Bas-relief en Amphibolite (hache)", + "block.mineralogy.amphibolite_relief_blank": "Bas-relief en Amphibolite (sans motif)", + "block.mineralogy.amphibolite_relief_cross": "Bas-relief en Amphibolite (croix)", + "block.mineralogy.amphibolite_relief_hammer": "Bas-relief en Amphibolite (marteau)", + "block.mineralogy.amphibolite_relief_hoe": "Bas-relief en Amphibolite (houe)", + "block.mineralogy.amphibolite_relief_horizontal": "Bas-relief en Amphibolite (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Bas-relief en Amphibolite (I)", + "block.mineralogy.amphibolite_relief_left": "Bas-relief en Amphibolite (gauche)", + "block.mineralogy.amphibolite_relief_pickaxe": "Bas-relief en Amphibolite (pioche)", + "block.mineralogy.amphibolite_relief_plus": "Bas-relief en Amphibolite (signe plus)", + "block.mineralogy.amphibolite_relief_right": "Bas-relief en Amphibolite (droite)", + "block.mineralogy.amphibolite_relief_sword": "Bas-relief en Amphibolite (épée)", + "block.mineralogy.amphibolite_relief_vertical": "Bas-relief en Amphibolite (vertical)", + "block.mineralogy.diabase_relief_axe": "Bas-relief en Diabase (hache)", + "block.mineralogy.diabase_relief_blank": "Bas-relief en Diabase (sans motif)", + "block.mineralogy.diabase_relief_cross": "Bas-relief en Diabase (croix)", + "block.mineralogy.diabase_relief_hammer": "Bas-relief en Diabase (marteau)", + "block.mineralogy.diabase_relief_hoe": "Bas-relief en Diabase (houe)", + "block.mineralogy.diabase_relief_horizontal": "Bas-relief en Diabase (horizontal)", + "block.mineralogy.diabase_relief_i": "Bas-relief en Diabase (I)", + "block.mineralogy.diabase_relief_left": "Bas-relief en Diabase (gauche)", + "block.mineralogy.diabase_relief_pickaxe": "Bas-relief en Diabase (pioche)", + "block.mineralogy.diabase_relief_plus": "Bas-relief en Diabase (signe plus)", + "block.mineralogy.diabase_relief_right": "Bas-relief en Diabase (droite)", + "block.mineralogy.diabase_relief_sword": "Bas-relief en Diabase (épée)", + "block.mineralogy.diabase_relief_vertical": "Bas-relief en Diabase (vertical)", + "block.mineralogy.gabbro_relief_axe": "Bas-relief en Gabbro (hache)", + "block.mineralogy.gabbro_relief_blank": "Bas-relief en Gabbro (sans motif)", + "block.mineralogy.gabbro_relief_cross": "Bas-relief en Gabbro (croix)", + "block.mineralogy.gabbro_relief_hammer": "Bas-relief en Gabbro (marteau)", + "block.mineralogy.gabbro_relief_hoe": "Bas-relief en Gabbro (houe)", + "block.mineralogy.gabbro_relief_horizontal": "Bas-relief en Gabbro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Bas-relief en Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Bas-relief en Gabbro (gauche)", + "block.mineralogy.gabbro_relief_pickaxe": "Bas-relief en Gabbro (pioche)", + "block.mineralogy.gabbro_relief_plus": "Bas-relief en Gabbro (signe plus)", + "block.mineralogy.gabbro_relief_right": "Bas-relief en Gabbro (droite)", + "block.mineralogy.gabbro_relief_sword": "Bas-relief en Gabbro (épée)", + "block.mineralogy.gabbro_relief_vertical": "Bas-relief en Gabbro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Bas-relief en Péridotite (hache)", + "block.mineralogy.peridotite_relief_blank": "Bas-relief en Péridotite (sans motif)", + "block.mineralogy.peridotite_relief_cross": "Bas-relief en Péridotite (croix)", + "block.mineralogy.peridotite_relief_hammer": "Bas-relief en Péridotite (marteau)", + "block.mineralogy.peridotite_relief_hoe": "Bas-relief en Péridotite (houe)", + "block.mineralogy.peridotite_relief_horizontal": "Bas-relief en Péridotite (horizontal)", + "block.mineralogy.peridotite_relief_i": "Bas-relief en Péridotite (I)", + "block.mineralogy.peridotite_relief_left": "Bas-relief en Péridotite (gauche)", + "block.mineralogy.peridotite_relief_pickaxe": "Bas-relief en Péridotite (pioche)", + "block.mineralogy.peridotite_relief_plus": "Bas-relief en Péridotite (signe plus)", + "block.mineralogy.peridotite_relief_right": "Bas-relief en Péridotite (droite)", + "block.mineralogy.peridotite_relief_sword": "Bas-relief en Péridotite (épée)", + "block.mineralogy.peridotite_relief_vertical": "Bas-relief en Péridotite (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Bas-relief en Verre basaltique (hache)", + "block.mineralogy.basaltic_glass_relief_blank": "Bas-relief en Verre basaltique (sans motif)", + "block.mineralogy.basaltic_glass_relief_cross": "Bas-relief en Verre basaltique (croix)", + "block.mineralogy.basaltic_glass_relief_hammer": "Bas-relief en Verre basaltique (marteau)", + "block.mineralogy.basaltic_glass_relief_hoe": "Bas-relief en Verre basaltique (houe)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Bas-relief en Verre basaltique (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Bas-relief en Verre basaltique (I)", + "block.mineralogy.basaltic_glass_relief_left": "Bas-relief en Verre basaltique (gauche)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Bas-relief en Verre basaltique (pioche)", + "block.mineralogy.basaltic_glass_relief_plus": "Bas-relief en Verre basaltique (signe plus)", + "block.mineralogy.basaltic_glass_relief_right": "Bas-relief en Verre basaltique (droite)", + "block.mineralogy.basaltic_glass_relief_sword": "Bas-relief en Verre basaltique (épée)", + "block.mineralogy.basaltic_glass_relief_vertical": "Bas-relief en Verre basaltique (vertical)", + "block.mineralogy.scoria_relief_axe": "Bas-relief en Scorie (hache)", + "block.mineralogy.scoria_relief_blank": "Bas-relief en Scorie (sans motif)", + "block.mineralogy.scoria_relief_cross": "Bas-relief en Scorie (croix)", + "block.mineralogy.scoria_relief_hammer": "Bas-relief en Scorie (marteau)", + "block.mineralogy.scoria_relief_hoe": "Bas-relief en Scorie (houe)", + "block.mineralogy.scoria_relief_horizontal": "Bas-relief en Scorie (horizontal)", + "block.mineralogy.scoria_relief_i": "Bas-relief en Scorie (I)", + "block.mineralogy.scoria_relief_left": "Bas-relief en Scorie (gauche)", + "block.mineralogy.scoria_relief_pickaxe": "Bas-relief en Scorie (pioche)", + "block.mineralogy.scoria_relief_plus": "Bas-relief en Scorie (signe plus)", + "block.mineralogy.scoria_relief_right": "Bas-relief en Scorie (droite)", + "block.mineralogy.scoria_relief_sword": "Bas-relief en Scorie (épée)", + "block.mineralogy.scoria_relief_vertical": "Bas-relief en Scorie (vertical)", + "block.mineralogy.tuff_relief_axe": "Bas-relief en Tuf (hache)", + "block.mineralogy.tuff_relief_blank": "Bas-relief en Tuf (sans motif)", + "block.mineralogy.tuff_relief_cross": "Bas-relief en Tuf (croix)", + "block.mineralogy.tuff_relief_hammer": "Bas-relief en Tuf (marteau)", + "block.mineralogy.tuff_relief_hoe": "Bas-relief en Tuf (houe)", + "block.mineralogy.tuff_relief_horizontal": "Bas-relief en Tuf (horizontal)", + "block.mineralogy.tuff_relief_i": "Bas-relief en Tuf (I)", + "block.mineralogy.tuff_relief_left": "Bas-relief en Tuf (gauche)", + "block.mineralogy.tuff_relief_pickaxe": "Bas-relief en Tuf (pioche)", + "block.mineralogy.tuff_relief_plus": "Bas-relief en Tuf (signe plus)", + "block.mineralogy.tuff_relief_right": "Bas-relief en Tuf (droite)", + "block.mineralogy.tuff_relief_sword": "Bas-relief en Tuf (épée)", + "block.mineralogy.tuff_relief_vertical": "Bas-relief en Tuf (vertical)", + "block.mineralogy.siltstone_relief_axe": "Bas-relief en Siltite (hache)", + "block.mineralogy.siltstone_relief_blank": "Bas-relief en Siltite (sans motif)", + "block.mineralogy.siltstone_relief_cross": "Bas-relief en Siltite (croix)", + "block.mineralogy.siltstone_relief_hammer": "Bas-relief en Siltite (marteau)", + "block.mineralogy.siltstone_relief_hoe": "Bas-relief en Siltite (houe)", + "block.mineralogy.siltstone_relief_horizontal": "Bas-relief en Siltite (horizontal)", + "block.mineralogy.siltstone_relief_i": "Bas-relief en Siltite (I)", + "block.mineralogy.siltstone_relief_left": "Bas-relief en Siltite (gauche)", + "block.mineralogy.siltstone_relief_pickaxe": "Bas-relief en Siltite (pioche)", + "block.mineralogy.siltstone_relief_plus": "Bas-relief en Siltite (signe plus)", + "block.mineralogy.siltstone_relief_right": "Bas-relief en Siltite (droite)", + "block.mineralogy.siltstone_relief_sword": "Bas-relief en Siltite (épée)", + "block.mineralogy.siltstone_relief_vertical": "Bas-relief en Siltite (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Bas-relief en Sel gemme (hache)", + "block.mineralogy.rock_salt_relief_blank": "Bas-relief en Sel gemme (sans motif)", + "block.mineralogy.rock_salt_relief_cross": "Bas-relief en Sel gemme (croix)", + "block.mineralogy.rock_salt_relief_hammer": "Bas-relief en Sel gemme (marteau)", + "block.mineralogy.rock_salt_relief_hoe": "Bas-relief en Sel gemme (houe)", + "block.mineralogy.rock_salt_relief_horizontal": "Bas-relief en Sel gemme (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Bas-relief en Sel gemme (I)", + "block.mineralogy.rock_salt_relief_left": "Bas-relief en Sel gemme (gauche)", + "block.mineralogy.rock_salt_relief_pickaxe": "Bas-relief en Sel gemme (pioche)", + "block.mineralogy.rock_salt_relief_plus": "Bas-relief en Sel gemme (signe plus)", + "block.mineralogy.rock_salt_relief_right": "Bas-relief en Sel gemme (droite)", + "block.mineralogy.rock_salt_relief_sword": "Bas-relief en Sel gemme (épée)", + "block.mineralogy.rock_salt_relief_vertical": "Bas-relief en Sel gemme (vertical)", + "block.mineralogy.hornfels_relief_axe": "Bas-relief en Cornéenne (hache)", + "block.mineralogy.hornfels_relief_blank": "Bas-relief en Cornéenne (sans motif)", + "block.mineralogy.hornfels_relief_cross": "Bas-relief en Cornéenne (croix)", + "block.mineralogy.hornfels_relief_hammer": "Bas-relief en Cornéenne (marteau)", + "block.mineralogy.hornfels_relief_hoe": "Bas-relief en Cornéenne (houe)", + "block.mineralogy.hornfels_relief_horizontal": "Bas-relief en Cornéenne (horizontal)", + "block.mineralogy.hornfels_relief_i": "Bas-relief en Cornéenne (I)", + "block.mineralogy.hornfels_relief_left": "Bas-relief en Cornéenne (gauche)", + "block.mineralogy.hornfels_relief_pickaxe": "Bas-relief en Cornéenne (pioche)", + "block.mineralogy.hornfels_relief_plus": "Bas-relief en Cornéenne (signe plus)", + "block.mineralogy.hornfels_relief_right": "Bas-relief en Cornéenne (droite)", + "block.mineralogy.hornfels_relief_sword": "Bas-relief en Cornéenne (épée)", + "block.mineralogy.hornfels_relief_vertical": "Bas-relief en Cornéenne (vertical)", + "block.mineralogy.quartzite_relief_axe": "Bas-relief en Quartzite (hache)", + "block.mineralogy.quartzite_relief_blank": "Bas-relief en Quartzite (sans motif)", + "block.mineralogy.quartzite_relief_cross": "Bas-relief en Quartzite (croix)", + "block.mineralogy.quartzite_relief_hammer": "Bas-relief en Quartzite (marteau)", + "block.mineralogy.quartzite_relief_hoe": "Bas-relief en Quartzite (houe)", + "block.mineralogy.quartzite_relief_horizontal": "Bas-relief en Quartzite (horizontal)", + "block.mineralogy.quartzite_relief_i": "Bas-relief en Quartzite (I)", + "block.mineralogy.quartzite_relief_left": "Bas-relief en Quartzite (gauche)", + "block.mineralogy.quartzite_relief_pickaxe": "Bas-relief en Quartzite (pioche)", + "block.mineralogy.quartzite_relief_plus": "Bas-relief en Quartzite (signe plus)", + "block.mineralogy.quartzite_relief_right": "Bas-relief en Quartzite (droite)", + "block.mineralogy.quartzite_relief_sword": "Bas-relief en Quartzite (épée)", + "block.mineralogy.quartzite_relief_vertical": "Bas-relief en Quartzite (vertical)", + "block.mineralogy.novaculite_relief_axe": "Bas-relief en Novaculite (hache)", + "block.mineralogy.novaculite_relief_blank": "Bas-relief en Novaculite (sans motif)", + "block.mineralogy.novaculite_relief_cross": "Bas-relief en Novaculite (croix)", + "block.mineralogy.novaculite_relief_hammer": "Bas-relief en Novaculite (marteau)", + "block.mineralogy.novaculite_relief_hoe": "Bas-relief en Novaculite (houe)", + "block.mineralogy.novaculite_relief_horizontal": "Bas-relief en Novaculite (horizontal)", + "block.mineralogy.novaculite_relief_i": "Bas-relief en Novaculite (I)", + "block.mineralogy.novaculite_relief_left": "Bas-relief en Novaculite (gauche)", + "block.mineralogy.novaculite_relief_pickaxe": "Bas-relief en Novaculite (pioche)", + "block.mineralogy.novaculite_relief_plus": "Bas-relief en Novaculite (signe plus)", + "block.mineralogy.novaculite_relief_right": "Bas-relief en Novaculite (droite)", + "block.mineralogy.novaculite_relief_sword": "Bas-relief en Novaculite (épée)", + "block.mineralogy.novaculite_relief_vertical": "Bas-relief en Novaculite (vertical)", "itemGroup.mineralogy.mineralogy": "Minéralogie", - "itemGroup.mineralogy.rock": "Roches minéralogiques", + "itemGroup.mineralogy.rock": "Roches de Minéralogie", "itemGroup.mineralogy.stair": "Escaliers de Minéralogie", - "itemGroup.mineralogy.slab": "Dalles de minéralogie", - "itemGroup.mineralogy.wall": "Murs de Minéralogie", - "itemGroup.mineralogy.item": "Objets de minéralogie" + "itemGroup.mineralogy.slab": "Dalles de Minéralogie", + "itemGroup.mineralogy.wall": "Murets de Minéralogie", + "itemGroup.mineralogy.item": "Objets de Minéralogie", + "block.mineralogy.crude_oil": "Pétrole brut", + "item.mineralogy.crude_oil_bucket": "Seau de pétrole brut", + "fluid.mineralogy.crude_oil": "Pétrole brut", + "advancements.mineralogy.all_the_rocks.title": "Toutes les roches", + "advancements.mineralogy.all_the_rocks.description": "Vous avez trouvé tous les types de roches standard de Mineralogy !" } diff --git a/src/main/resources/assets/mineralogy/lang/fr_fr.json b/src/main/resources/assets/mineralogy/lang/fr_fr.json index e58696710..adfa816a0 100644 --- a/src/main/resources/assets/mineralogy/lang/fr_fr.json +++ b/src/main/resources/assets/mineralogy/lang/fr_fr.json @@ -1,196 +1,196 @@ { "block.mineralogy.andesite": "Andésite", - "block.mineralogy.andesite_stairs": "Escaliers Andésites", - "block.mineralogy.andesite_slab": "Dalle d'Andésite", - "block.mineralogy.andesite_brick": "Brique d'Andésite", - "block.mineralogy.andesite_brick_stairs": "Escaliers en brique d'Andesite", - "block.mineralogy.andesite_brick_slab": "Dalle de brique d'Andesite", - "block.mineralogy.andesite_smooth": "Andésite polie", - "block.mineralogy.andesite_smooth_stairs": "Escaliers polis d'Andésite", - "block.mineralogy.andesite_smooth_slab": "Dalle polie d'Andésite", - "block.mineralogy.andesite_smooth_brick": "Brique polie d'Andésite", - "block.mineralogy.andesite_smooth_brick_stairs": "Escaliers en brique polis par Andesite", - "block.mineralogy.andesite_smooth_brick_slab": "Dalle de brique polie d'Andésite", + "block.mineralogy.andesite_stairs": "Escalier en Andésite", + "block.mineralogy.andesite_slab": "Dalle en Andésite", + "block.mineralogy.andesite_brick": "Briques en Andésite", + "block.mineralogy.andesite_brick_stairs": "Escalier en briques de Andésite", + "block.mineralogy.andesite_brick_slab": "Dalle en briques de Andésite", + "block.mineralogy.andesite_smooth": "Bloc poli en Andésite", + "block.mineralogy.andesite_smooth_stairs": "Escalier poli en Andésite", + "block.mineralogy.andesite_smooth_slab": "Dalle polie en Andésite", + "block.mineralogy.andesite_smooth_brick": "Briques polies en Andésite", + "block.mineralogy.andesite_smooth_brick_stairs": "Escalier en briques polies de Andésite", + "block.mineralogy.andesite_smooth_brick_slab": "Dalle en briques polies de Andésite", "block.mineralogy.basalt": "Basalte", - "block.mineralogy.basalt_stairs": "Escaliers basaltiques", - "block.mineralogy.basalt_slab": "Dalle de basalte", - "block.mineralogy.basalt_brick": "Brique de basalte", - "block.mineralogy.basalt_brick_stairs": "Escaliers de brique de basalte", - "block.mineralogy.basalt_brick_slab": "Dalle de brique de basalte", - "block.mineralogy.basalt_smooth": "Basalte poli", - "block.mineralogy.basalt_smooth_stairs": "Escaliers polis au basalte", - "block.mineralogy.basalt_smooth_slab": "Dalle polie au basalte", - "block.mineralogy.basalt_smooth_brick": "Brique polie au basalte", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaliers en brique polis au basalte", - "block.mineralogy.basalt_smooth_brick_slab": "Dalle de brique polie au basalte", + "block.mineralogy.basalt_stairs": "Escalier en Basalte", + "block.mineralogy.basalt_slab": "Dalle en Basalte", + "block.mineralogy.basalt_brick": "Briques en Basalte", + "block.mineralogy.basalt_brick_stairs": "Escalier en briques de Basalte", + "block.mineralogy.basalt_brick_slab": "Dalle en briques de Basalte", + "block.mineralogy.basalt_smooth": "Bloc poli en Basalte", + "block.mineralogy.basalt_smooth_stairs": "Escalier poli en Basalte", + "block.mineralogy.basalt_smooth_slab": "Dalle polie en Basalte", + "block.mineralogy.basalt_smooth_brick": "Briques polies en Basalte", + "block.mineralogy.basalt_smooth_brick_stairs": "Escalier en briques polies de Basalte", + "block.mineralogy.basalt_smooth_brick_slab": "Dalle en briques polies de Basalte", "block.mineralogy.diorite": "Diorite", - "block.mineralogy.diorite_stairs": "Escaliers Diorite", - "block.mineralogy.diorite_slab": "Dalle de Diorite", - "block.mineralogy.diorite_brick": "Brique Diorite", - "block.mineralogy.diorite_brick_stairs": "Escaliers en brique Diorite", - "block.mineralogy.diorite_brick_slab": "Dalle de brique Diorite", - "block.mineralogy.diorite_smooth": "Diorite polie", - "block.mineralogy.diorite_smooth_stairs": "Escaliers polis au Diorite", - "block.mineralogy.diorite_smooth_slab": "Dalle polie Diorite", - "block.mineralogy.diorite_smooth_brick": "Brique polie Diorite", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaliers en briques polies Diorite", - "block.mineralogy.diorite_smooth_brick_slab": "Dalle de brique polie Diorite", - "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Escaliers en granit", - "block.mineralogy.granite_slab": "Dalle de granit", - "block.mineralogy.granite_brick": "Brique de granit", - "block.mineralogy.granite_brick_stairs": "Escaliers en brique de granit", - "block.mineralogy.granite_brick_slab": "Dalle de brique de granit", - "block.mineralogy.granite_smooth": "Granit poli", - "block.mineralogy.granite_smooth_stairs": "Escaliers polis de granit", - "block.mineralogy.granite_smooth_slab": "Dalle polie de granit", - "block.mineralogy.granite_smooth_brick": "Brique polie de granit", - "block.mineralogy.granite_smooth_brick_stairs": "Escaliers en brique polis de granit", - "block.mineralogy.granite_smooth_brick_slab": "Dalle de brique polie de granit", + "block.mineralogy.diorite_stairs": "Escalier en Diorite", + "block.mineralogy.diorite_slab": "Dalle en Diorite", + "block.mineralogy.diorite_brick": "Briques en Diorite", + "block.mineralogy.diorite_brick_stairs": "Escalier en briques de Diorite", + "block.mineralogy.diorite_brick_slab": "Dalle en briques de Diorite", + "block.mineralogy.diorite_smooth": "Bloc poli en Diorite", + "block.mineralogy.diorite_smooth_stairs": "Escalier poli en Diorite", + "block.mineralogy.diorite_smooth_slab": "Dalle polie en Diorite", + "block.mineralogy.diorite_smooth_brick": "Briques polies en Diorite", + "block.mineralogy.diorite_smooth_brick_stairs": "Escalier en briques polies de Diorite", + "block.mineralogy.diorite_smooth_brick_slab": "Dalle en briques polies de Diorite", + "block.mineralogy.granite": "Granite", + "block.mineralogy.granite_stairs": "Escalier en Granite", + "block.mineralogy.granite_slab": "Dalle en Granite", + "block.mineralogy.granite_brick": "Briques en Granite", + "block.mineralogy.granite_brick_stairs": "Escalier en briques de Granite", + "block.mineralogy.granite_brick_slab": "Dalle en briques de Granite", + "block.mineralogy.granite_smooth": "Bloc poli en Granite", + "block.mineralogy.granite_smooth_stairs": "Escalier poli en Granite", + "block.mineralogy.granite_smooth_slab": "Dalle polie en Granite", + "block.mineralogy.granite_smooth_brick": "Briques polies en Granite", + "block.mineralogy.granite_smooth_brick_stairs": "Escalier en briques polies de Granite", + "block.mineralogy.granite_smooth_brick_slab": "Dalle en briques polies de Granite", "block.mineralogy.rhyolite": "Rhyolite", - "block.mineralogy.rhyolite_stairs": "Escaliers en rhyolite", - "block.mineralogy.rhyolite_slab": "Dalle de rhyolite", - "block.mineralogy.rhyolite_brick": "Brique de rhyolite", - "block.mineralogy.rhyolite_brick_stairs": "Escaliers en brique de rhyolite", - "block.mineralogy.rhyolite_brick_slab": "Dalle de brique de rhyolite", - "block.mineralogy.rhyolite_smooth": "Rhyolite polie", - "block.mineralogy.rhyolite_smooth_stairs": "Escaliers polis à la rhyolite", - "block.mineralogy.rhyolite_smooth_slab": "Dalle polie à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick": "Brique polie de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaliers en briques polies à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle de brique polie rhyolite", + "block.mineralogy.rhyolite_stairs": "Escalier en Rhyolite", + "block.mineralogy.rhyolite_slab": "Dalle en Rhyolite", + "block.mineralogy.rhyolite_brick": "Briques en Rhyolite", + "block.mineralogy.rhyolite_brick_stairs": "Escalier en briques de Rhyolite", + "block.mineralogy.rhyolite_brick_slab": "Dalle en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth": "Bloc poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_stairs": "Escalier poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_slab": "Dalle polie en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick": "Briques polies en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escalier en briques polies de Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle en briques polies de Rhyolite", "block.mineralogy.pegmatite": "Pegmatite", - "block.mineralogy.pegmatite_stairs": "Escaliers en Pegmatite", - "block.mineralogy.pegmatite_slab": "Dalle de Pegmatite", - "block.mineralogy.pegmatite_brick": "Brique de Pegmatite", - "block.mineralogy.pegmatite_brick_stairs": "Escaliers en brique de Pegmatite", - "block.mineralogy.pegmatite_brick_slab": "Dalle de brique de Pegmatite", - "block.mineralogy.pegmatite_smooth": "Pegmatite polie", - "block.mineralogy.pegmatite_smooth_stairs": "Escaliers polis à la Pegmatite", - "block.mineralogy.pegmatite_smooth_slab": "Dalle polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick": "Brique polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaliers en briques polies à la Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle de brique polie par Pegmatite", + "block.mineralogy.pegmatite_stairs": "Escalier en Pegmatite", + "block.mineralogy.pegmatite_slab": "Dalle en Pegmatite", + "block.mineralogy.pegmatite_brick": "Briques en Pegmatite", + "block.mineralogy.pegmatite_brick_stairs": "Escalier en briques de Pegmatite", + "block.mineralogy.pegmatite_brick_slab": "Dalle en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth": "Bloc poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_stairs": "Escalier poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_slab": "Dalle polie en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick": "Briques polies en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escalier en briques polies de Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle en briques polies de Pegmatite", "block.mineralogy.shale": "Schiste argileux", - "block.mineralogy.shale_stairs": "Escaliers de schiste", - "block.mineralogy.shale_slab": "Dalle de schiste", - "block.mineralogy.shale_brick": "Brique de schiste", - "block.mineralogy.shale_brick_stairs": "Escaliers de briques de schiste", - "block.mineralogy.shale_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.shale_smooth": "Schiste poli", - "block.mineralogy.shale_smooth_stairs": "Escaliers polis au schiste", - "block.mineralogy.shale_smooth_slab": "Dalle polie au schiste", - "block.mineralogy.shale_smooth_brick": "Brique polie schiste", - "block.mineralogy.shale_smooth_brick_stairs": "Escaliers de brique polis au schiste", - "block.mineralogy.shale_smooth_brick_slab": "Dalle de brique polie au schiste", + "block.mineralogy.shale_stairs": "Escalier en Schiste argileux", + "block.mineralogy.shale_slab": "Dalle en Schiste argileux", + "block.mineralogy.shale_brick": "Briques en Schiste argileux", + "block.mineralogy.shale_brick_stairs": "Escalier en briques de Schiste argileux", + "block.mineralogy.shale_brick_slab": "Dalle en briques de Schiste argileux", + "block.mineralogy.shale_smooth": "Bloc poli en Schiste argileux", + "block.mineralogy.shale_smooth_stairs": "Escalier poli en Schiste argileux", + "block.mineralogy.shale_smooth_slab": "Dalle polie en Schiste argileux", + "block.mineralogy.shale_smooth_brick": "Briques polies en Schiste argileux", + "block.mineralogy.shale_smooth_brick_stairs": "Escalier en briques polies de Schiste argileux", + "block.mineralogy.shale_smooth_brick_slab": "Dalle en briques polies de Schiste argileux", "block.mineralogy.conglomerate": "Conglomérat", - "block.mineralogy.conglomerate_stairs": "Escaliers du Conglomérat", - "block.mineralogy.conglomerate_slab": "Dalle de conglomérat", - "block.mineralogy.conglomerate_brick": "Brique Conglomérat", - "block.mineralogy.conglomerate_brick_stairs": "Escaliers en brique de Conglomérat", - "block.mineralogy.conglomerate_brick_slab": "Dalle de brique de conglomérat", - "block.mineralogy.conglomerate_smooth": "Conglomérat poli", - "block.mineralogy.conglomerate_smooth_stairs": "Escaliers polis au conglomérat", - "block.mineralogy.conglomerate_smooth_slab": "Conglomerate dalle polie", - "block.mineralogy.conglomerate_smooth_brick": "Conglomerate brique polie", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Conglomerate poli escalier en brique", - "block.mineralogy.conglomerate_smooth_brick_slab": "Plaque de brique polie Conglomerate", + "block.mineralogy.conglomerate_stairs": "Escalier en Conglomérat", + "block.mineralogy.conglomerate_slab": "Dalle en Conglomérat", + "block.mineralogy.conglomerate_brick": "Briques en Conglomérat", + "block.mineralogy.conglomerate_brick_stairs": "Escalier en briques de Conglomérat", + "block.mineralogy.conglomerate_brick_slab": "Dalle en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth": "Bloc poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_stairs": "Escalier poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_slab": "Dalle polie en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick": "Briques polies en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escalier en briques polies de Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Dalle en briques polies de Conglomérat", "block.mineralogy.dolomite": "Dolomie", - "block.mineralogy.dolomite_stairs": "Escaliers en dolomite", - "block.mineralogy.dolomite_slab": "Dalle de dolomite", - "block.mineralogy.dolomite_brick": "Brique de dolomite", - "block.mineralogy.dolomite_brick_stairs": "Escaliers de brique en dolomite", - "block.mineralogy.dolomite_brick_slab": "Dalle de brique en dolomite", - "block.mineralogy.dolomite_smooth": "Dolomite polie", - "block.mineralogy.dolomite_smooth_stairs": "Escaliers polis en dolomite", - "block.mineralogy.dolomite_smooth_slab": "Dalle polie en dolomite", - "block.mineralogy.dolomite_smooth_brick": "Brique polie de Dolomite", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaliers en briques polies dolomitiques", - "block.mineralogy.dolomite_smooth_brick_slab": "Dalle de brique polie en dolomite", + "block.mineralogy.dolomite_stairs": "Escalier en Dolomie", + "block.mineralogy.dolomite_slab": "Dalle en Dolomie", + "block.mineralogy.dolomite_brick": "Briques en Dolomie", + "block.mineralogy.dolomite_brick_stairs": "Escalier en briques de Dolomie", + "block.mineralogy.dolomite_brick_slab": "Dalle en briques de Dolomie", + "block.mineralogy.dolomite_smooth": "Bloc poli en Dolomie", + "block.mineralogy.dolomite_smooth_stairs": "Escalier poli en Dolomie", + "block.mineralogy.dolomite_smooth_slab": "Dalle polie en Dolomie", + "block.mineralogy.dolomite_smooth_brick": "Briques polies en Dolomie", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escalier en briques polies de Dolomie", + "block.mineralogy.dolomite_smooth_brick_slab": "Dalle en briques polies de Dolomie", "block.mineralogy.limestone": "Calcaire", - "block.mineralogy.limestone_stairs": "Escaliers en calcaire", - "block.mineralogy.limestone_slab": "Dalle de calcaire", - "block.mineralogy.limestone_brick": "Brique de calcaire", - "block.mineralogy.limestone_brick_stairs": "Escaliers en brique calcaire", - "block.mineralogy.limestone_brick_slab": "Dalle de brique en calcaire", - "block.mineralogy.limestone_smooth": "Calcaire poli", - "block.mineralogy.limestone_smooth_stairs": "Escaliers polis au calcaire", - "block.mineralogy.limestone_smooth_slab": "Dalle polie en calcaire", - "block.mineralogy.limestone_smooth_brick": "Brique polie au calcaire", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaliers en briques polis à la chaux", - "block.mineralogy.limestone_smooth_brick_slab": "Dalle de brique polie au calcaire", + "block.mineralogy.limestone_stairs": "Escalier en Calcaire", + "block.mineralogy.limestone_slab": "Dalle en Calcaire", + "block.mineralogy.limestone_brick": "Briques en Calcaire", + "block.mineralogy.limestone_brick_stairs": "Escalier en briques de Calcaire", + "block.mineralogy.limestone_brick_slab": "Dalle en briques de Calcaire", + "block.mineralogy.limestone_smooth": "Bloc poli en Calcaire", + "block.mineralogy.limestone_smooth_stairs": "Escalier poli en Calcaire", + "block.mineralogy.limestone_smooth_slab": "Dalle polie en Calcaire", + "block.mineralogy.limestone_smooth_brick": "Briques polies en Calcaire", + "block.mineralogy.limestone_smooth_brick_stairs": "Escalier en briques polies de Calcaire", + "block.mineralogy.limestone_smooth_brick_slab": "Dalle en briques polies de Calcaire", "block.mineralogy.slate": "Ardoise", - "block.mineralogy.slate_stairs": "Escaliers en ardoise", - "block.mineralogy.slate_slab": "Dalle d'ardoise", - "block.mineralogy.slate_brick": "Brique d'ardoise", - "block.mineralogy.slate_brick_stairs": "Escaliers en briques d'ardoise", - "block.mineralogy.slate_brick_slab": "Dalle de briques d'ardoise", - "block.mineralogy.slate_smooth": "Ardoise polie", - "block.mineralogy.slate_smooth_stairs": "Escaliers polis en ardoise", - "block.mineralogy.slate_smooth_slab": "Dalle polie en ardoise", - "block.mineralogy.slate_smooth_brick": "Brique polie d'ardoise", - "block.mineralogy.slate_smooth_brick_stairs": "Escaliers en brique polie en ardoise", - "block.mineralogy.slate_smooth_brick_slab": "Dalle de brique polie ardoise", - "block.mineralogy.schist": "Schiste", - "block.mineralogy.schist_stairs": "Escaliers de schiste", - "block.mineralogy.schist_slab": "Dalle de schiste", - "block.mineralogy.schist_brick": "Brique de schiste", - "block.mineralogy.schist_brick_stairs": "Escaliers en brique de schiste", - "block.mineralogy.schist_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.schist_smooth": "Schiste poli", - "block.mineralogy.schist_smooth_stairs": "Escaliers polis Schiste", - "block.mineralogy.schist_smooth_slab": "Dalle polie par schiste", - "block.mineralogy.schist_smooth_brick": "Brique polie par schiste", - "block.mineralogy.schist_smooth_brick_stairs": "Escaliers de brique polis par schiste", - "block.mineralogy.schist_smooth_brick_slab": "Dalle de brique polie par schiste", + "block.mineralogy.slate_stairs": "Escalier en Ardoise", + "block.mineralogy.slate_slab": "Dalle en Ardoise", + "block.mineralogy.slate_brick": "Briques en Ardoise", + "block.mineralogy.slate_brick_stairs": "Escalier en briques de Ardoise", + "block.mineralogy.slate_brick_slab": "Dalle en briques de Ardoise", + "block.mineralogy.slate_smooth": "Bloc poli en Ardoise", + "block.mineralogy.slate_smooth_stairs": "Escalier poli en Ardoise", + "block.mineralogy.slate_smooth_slab": "Dalle polie en Ardoise", + "block.mineralogy.slate_smooth_brick": "Briques polies en Ardoise", + "block.mineralogy.slate_smooth_brick_stairs": "Escalier en briques polies de Ardoise", + "block.mineralogy.slate_smooth_brick_slab": "Dalle en briques polies de Ardoise", + "block.mineralogy.schist": "Micaschiste", + "block.mineralogy.schist_stairs": "Escalier en Micaschiste", + "block.mineralogy.schist_slab": "Dalle en Micaschiste", + "block.mineralogy.schist_brick": "Briques en Micaschiste", + "block.mineralogy.schist_brick_stairs": "Escalier en briques de Micaschiste", + "block.mineralogy.schist_brick_slab": "Dalle en briques de Micaschiste", + "block.mineralogy.schist_smooth": "Bloc poli en Micaschiste", + "block.mineralogy.schist_smooth_stairs": "Escalier poli en Micaschiste", + "block.mineralogy.schist_smooth_slab": "Dalle polie en Micaschiste", + "block.mineralogy.schist_smooth_brick": "Briques polies en Micaschiste", + "block.mineralogy.schist_smooth_brick_stairs": "Escalier en briques polies de Micaschiste", + "block.mineralogy.schist_smooth_brick_slab": "Dalle en briques polies de Micaschiste", "block.mineralogy.gneiss": "Gneiss", - "block.mineralogy.gneiss_stairs": "Escaliers de gneiss", - "block.mineralogy.gneiss_slab": "Dalle de gneiss", - "block.mineralogy.gneiss_brick": "Brique de gneiss", - "block.mineralogy.gneiss_brick_stairs": "Escaliers en brique de gneiss", - "block.mineralogy.gneiss_brick_slab": "Dalle de brique de gneiss", - "block.mineralogy.gneiss_smooth": "Gneiss poli", - "block.mineralogy.gneiss_smooth_stairs": "Escaliers polis Gneiss", - "block.mineralogy.gneiss_smooth_slab": "Dalle polie au gneiss", - "block.mineralogy.gneiss_smooth_brick": "Brique polie gneiss", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaliers en brique polis gneiss", - "block.mineralogy.gneiss_smooth_brick_slab": "Dalle de brique polie par gneiss", + "block.mineralogy.gneiss_stairs": "Escalier en Gneiss", + "block.mineralogy.gneiss_slab": "Dalle en Gneiss", + "block.mineralogy.gneiss_brick": "Briques en Gneiss", + "block.mineralogy.gneiss_brick_stairs": "Escalier en briques de Gneiss", + "block.mineralogy.gneiss_brick_slab": "Dalle en briques de Gneiss", + "block.mineralogy.gneiss_smooth": "Bloc poli en Gneiss", + "block.mineralogy.gneiss_smooth_stairs": "Escalier poli en Gneiss", + "block.mineralogy.gneiss_smooth_slab": "Dalle polie en Gneiss", + "block.mineralogy.gneiss_smooth_brick": "Briques polies en Gneiss", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escalier en briques polies de Gneiss", + "block.mineralogy.gneiss_smooth_brick_slab": "Dalle en briques polies de Gneiss", "block.mineralogy.marble": "Marbre", - "block.mineralogy.marble_stairs": "Escaliers en marbre", - "block.mineralogy.marble_slab": "Dalle de marbre", - "block.mineralogy.marble_brick": "Brique de marbre", - "block.mineralogy.marble_brick_stairs": "Escaliers en brique de marbre", - "block.mineralogy.marble_brick_slab": "Dalle de brique en marbre", - "block.mineralogy.marble_smooth": "Marbre poli", - "block.mineralogy.marble_smooth_stairs": "Escaliers polis en marbre", - "block.mineralogy.marble_smooth_slab": "Dalle polie en marbre", - "block.mineralogy.marble_smooth_brick": "Brique polie en marbre", - "block.mineralogy.marble_smooth_brick_stairs": "Escaliers en brique polis en marbre", - "block.mineralogy.marble_smooth_brick_slab": "Dalle de brique polie en marbre", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaliers en phyllite", - "block.mineralogy.phyllite_slab": "Dalle de Phyllite", - "block.mineralogy.phyllite_brick": "Brique de phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaliers en brique de phyllite", - "block.mineralogy.phyllite_brick_slab": "Dalle de brique de phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite polie", - "block.mineralogy.phyllite_smooth_stairs": "Escaliers polis en phyllite", - "block.mineralogy.phyllite_smooth_slab": "Dalle polie en phyllite", - "block.mineralogy.phyllite_smooth_brick": "Brique polie de phyllite", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaliers en briques polies en phyllite", - "block.mineralogy.phyllite_smooth_brick_slab": "Dalle de brique poli en phyllite", + "block.mineralogy.marble_stairs": "Escalier en Marbre", + "block.mineralogy.marble_slab": "Dalle en Marbre", + "block.mineralogy.marble_brick": "Briques en Marbre", + "block.mineralogy.marble_brick_stairs": "Escalier en briques de Marbre", + "block.mineralogy.marble_brick_slab": "Dalle en briques de Marbre", + "block.mineralogy.marble_smooth": "Bloc poli en Marbre", + "block.mineralogy.marble_smooth_stairs": "Escalier poli en Marbre", + "block.mineralogy.marble_smooth_slab": "Dalle polie en Marbre", + "block.mineralogy.marble_smooth_brick": "Briques polies en Marbre", + "block.mineralogy.marble_smooth_brick_stairs": "Escalier en briques polies de Marbre", + "block.mineralogy.marble_smooth_brick_slab": "Dalle en briques polies de Marbre", + "block.mineralogy.phyllite": "Phyllade", + "block.mineralogy.phyllite_stairs": "Escalier en Phyllade", + "block.mineralogy.phyllite_slab": "Dalle en Phyllade", + "block.mineralogy.phyllite_brick": "Briques en Phyllade", + "block.mineralogy.phyllite_brick_stairs": "Escalier en briques de Phyllade", + "block.mineralogy.phyllite_brick_slab": "Dalle en briques de Phyllade", + "block.mineralogy.phyllite_smooth": "Bloc poli en Phyllade", + "block.mineralogy.phyllite_smooth_stairs": "Escalier poli en Phyllade", + "block.mineralogy.phyllite_smooth_slab": "Dalle polie en Phyllade", + "block.mineralogy.phyllite_smooth_brick": "Briques polies en Phyllade", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escalier en briques polies de Phyllade", + "block.mineralogy.phyllite_smooth_brick_slab": "Dalle en briques polies de Phyllade", "block.mineralogy.amphibolite": "Amphibolite", - "block.mineralogy.amphibolite_stairs": "Escaliers amphibolites", - "block.mineralogy.amphibolite_slab": "Plaque d'amphibolite", - "block.mineralogy.amphibolite_brick": "Brique d'amphibolite", - "block.mineralogy.amphibolite_brick_stairs": "Escaliers en brique amphibolite", - "block.mineralogy.amphibolite_brick_slab": "Plaque de brique d'amphibolite", - "block.mineralogy.amphibolite_smooth": "Amphibolite polie", - "block.mineralogy.amphibolite_smooth_stairs": "Escaliers polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_slab": "Dalle polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick": "Brique polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaliers en brique polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_slab": "Plaque de brique polie à l'amphibolite", + "block.mineralogy.amphibolite_stairs": "Escalier en Amphibolite", + "block.mineralogy.amphibolite_slab": "Dalle en Amphibolite", + "block.mineralogy.amphibolite_brick": "Briques en Amphibolite", + "block.mineralogy.amphibolite_brick_stairs": "Escalier en briques de Amphibolite", + "block.mineralogy.amphibolite_brick_slab": "Dalle en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth": "Bloc poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_stairs": "Escalier poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_slab": "Dalle polie en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick": "Briques polies en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escalier en briques polies de Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_slab": "Dalle en briques polies de Amphibolite", "item.mineralogy.gypsum_dust": "Poudre de gypse", "item.mineralogy.sulfur_dust": "Poudre de soufre", "item.mineralogy.phosphorous_dust": "Poudre de phosphore", @@ -201,740 +201,740 @@ "block.mineralogy.pumice": "Pierre ponce", "block.mineralogy.sulfur_block": "Soufre", "block.mineralogy.sulfur_ore": "Minerai de soufre", - "block.mineralogy.phosphorous_block": "Phosphoreux", + "block.mineralogy.phosphorous_block": "Phosphore", "block.mineralogy.phosphorous_ore": "Minerai de phosphore", "block.mineralogy.nitrate_block": "Nitrate", "block.mineralogy.nitrate_ore": "Minerai de nitrate", - "block.mineralogy.drywall_black": "Cloison sèche noire", - "block.mineralogy.drywall_red": "Cloison sèche rouge", - "block.mineralogy.drywall_green": "Cloison sèche verte", - "block.mineralogy.drywall_brown": "Cloison sèche brune", - "block.mineralogy.drywall_blue": "Cloison sèche bleue", - "block.mineralogy.drywall_purple": "Cloison sèche pourpre", - "block.mineralogy.drywall_cyan": "Cloison sèche cyan", - "block.mineralogy.drywall_silver": "Cloison sèche plafond gris", - "block.mineralogy.drywall_gray": "Cloison sèche grise", - "block.mineralogy.drywall_pink": "Cloison sèche rose", - "block.mineralogy.drywall_lime": "Cloison sèche vert-lime", - "block.mineralogy.drywall_yellow": "Cloison sèche jaune", - "block.mineralogy.drywall_light_blue": "Cloison sèche bleu clair", - "block.mineralogy.drywall_magenta": "Cloison sèche magenta", - "block.mineralogy.drywall_orange": "Cloison sèche orange", - "block.mineralogy.drywall_white": "Cloison sèche blanche", - "block.mineralogy.andesite_wall": "Mur d'Andésite", - "block.mineralogy.andesite_brick_wall": "Mur de briques d'Andésite", - "block.mineralogy.andesite_smooth_wall": "Mur poli d'Andésite", - "block.mineralogy.andesite_smooth_brick_wall": "Mur de briques polies par Andesite", - "block.mineralogy.basalt_wall": "Mur de basalte", - "block.mineralogy.basalt_brick_wall": "Mur de brique de basalte", - "block.mineralogy.basalt_smooth_wall": "Mur poli au basalte", - "block.mineralogy.basalt_smooth_brick_wall": "Mur de briques polies au basalte", - "block.mineralogy.diorite_wall": "Mur de Diorite", - "block.mineralogy.diorite_brick_wall": "Mur de briques Diorite", - "block.mineralogy.diorite_smooth_wall": "Mur Poli Diorite", - "block.mineralogy.diorite_smooth_brick_wall": "Mur de briques poli Diorite", - "block.mineralogy.granite_wall": "Mur de granit", - "block.mineralogy.granite_brick_wall": "Mur de briques de granit", - "block.mineralogy.granite_smooth_wall": "Mur poli de granit", - "block.mineralogy.granite_smooth_brick_wall": "Mur de briques poli de granit", - "block.mineralogy.rhyolite_wall": "Mur de rhyolite", - "block.mineralogy.rhyolite_brick_wall": "Mur de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_wall": "Mur poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_wall": "Mur de briques polies à la rhyolite", - "block.mineralogy.pegmatite_wall": "Mur de Pegmatite", - "block.mineralogy.pegmatite_brick_wall": "Mur de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_wall": "Mur poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_wall": "Mur de briques poli à la Pegmatite", - "block.mineralogy.shale_wall": "Mur de schiste", - "block.mineralogy.shale_brick_wall": "Mur de briques de schiste", - "block.mineralogy.shale_smooth_wall": "Mur poli de schiste", - "block.mineralogy.shale_smooth_brick_wall": "Mur de briques polies au schiste", - "block.mineralogy.conglomerate_wall": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_wall": "Mur de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_wall": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_wall": "Mur de dolomite", - "block.mineralogy.dolomite_brick_wall": "Mur de briques de dolomite", - "block.mineralogy.dolomite_smooth_wall": "Mur poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_wall": "Mur de briques poli à la dolomite", - "block.mineralogy.limestone_wall": "Mur de calcaire", - "block.mineralogy.limestone_brick_wall": "Mur de briques en calcaire", - "block.mineralogy.limestone_smooth_wall": "Mur poli au calcaire", - "block.mineralogy.limestone_smooth_brick_wall": "Mur de briques poli au calcaire", - "block.mineralogy.marble_wall": "Mur de marbre", - "block.mineralogy.marble_brick_wall": "Mur de briques en marbre", - "block.mineralogy.marble_smooth_wall": "Mur poli en marbre", - "block.mineralogy.marble_smooth_brick_wall": "Mur de briques polies en marbre", - "block.mineralogy.slate_wall": "Mur d'ardoise", - "block.mineralogy.slate_brick_wall": "Mur de briques d'ardoise", - "block.mineralogy.slate_smooth_wall": "Mur d'ardoise poli", - "block.mineralogy.slate_smooth_brick_wall": "Ardoise polie mur de briques", - "block.mineralogy.schist_wall": "Mur de schiste", - "block.mineralogy.schist_brick_wall": "Mur de briques de schiste", - "block.mineralogy.schist_smooth_wall": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_wall": "Mur de briques schist poli", - "block.mineralogy.gneiss_wall": "Mur de gneiss", - "block.mineralogy.gneiss_brick_wall": "Mur de briques en gneiss", - "block.mineralogy.gneiss_smooth_wall": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_wall": "Mur de phyllite", - "block.mineralogy.phyllite_brick_wall": "Mur de briques de phyllite", - "block.mineralogy.phyllite_smooth_wall": "Mur poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_wall": "Mur de briques poli en phyllite", - "block.mineralogy.amphibolite_wall": "Mur d'amphibolite", - "block.mineralogy.amphibolite_brick_wall": "Mur de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_wall": "Mur poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_wall": "Mur de briques poli à l'amphibolite", - "block.mineralogy.andesite_furnace": "Four à andésite", - "block.mineralogy.andesite_brick_furnace": "Four à briques d'andésite", - "block.mineralogy.andesite_smooth_furnace": "Four poli à andésite", - "block.mineralogy.andesite_smooth_brick_furnace": "Four à briques polies andésite", - "block.mineralogy.basalt_furnace": "Four à basalte", - "block.mineralogy.basalt_brick_furnace": "Four à briques de basalte", - "block.mineralogy.basalt_smooth_furnace": "Four à basalte poli", - "block.mineralogy.basalt_smooth_brick_furnace": "Four à briques polies en basalte", - "block.mineralogy.diorite_furnace": "Fourneau de Diorite", - "block.mineralogy.diorite_brick_furnace": "Fourneau de briques Diorite", - "block.mineralogy.diorite_smooth_furnace": "Fourneau Poli Diorite", - "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau de briques poli Diorite", - "block.mineralogy.granite_furnace": "Fourneau de granit", - "block.mineralogy.granite_brick_furnace": "Fourneau de briques de granit", - "block.mineralogy.granite_smooth_furnace": "Fourneau poli de granit", - "block.mineralogy.granite_smooth_brick_furnace": "Fourneau de briques poli de granit", - "block.mineralogy.rhyolite_furnace": "Fourneau de rhyolite", - "block.mineralogy.rhyolite_brick_furnace": "Fourneau de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau de briques polies à la rhyolite", - "block.mineralogy.pegmatite_furnace": "Fourneau de Pegmatite", - "block.mineralogy.pegmatite_brick_furnace": "Fourneau de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau de briques poli à la Pegmatite", - "block.mineralogy.shale_furnace": "Fourneau de schiste", - "block.mineralogy.shale_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.shale_smooth_furnace": "Fourneau poli de schiste", - "block.mineralogy.shale_smooth_brick_furnace": "Fourneau de briques polies au schiste", - "block.mineralogy.conglomerate_furnace": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_furnace": "Fourneau de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_furnace": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_furnace": "Fourneau de dolomite", - "block.mineralogy.dolomite_brick_furnace": "Fourneau de briques de dolomite", - "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau de briques poli à la dolomite", - "block.mineralogy.limestone_furnace": "Fourneau de calcaire", - "block.mineralogy.limestone_brick_furnace": "Fourneau de briques en calcaire", - "block.mineralogy.limestone_smooth_furnace": "Fourneau poli au calcaire", - "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau de briques poli au calcaire", - "block.mineralogy.marble_furnace": "Fourneau de marbre", - "block.mineralogy.marble_brick_furnace": "Fourneau de briques en marbre", - "block.mineralogy.marble_smooth_furnace": "Fourneau poli en marbre", - "block.mineralogy.marble_smooth_brick_furnace": "Fourneau de briques polies en marbre", - "block.mineralogy.slate_furnace": "Fourneau d'ardoise", - "block.mineralogy.slate_brick_furnace": "Fourneau de briques d'ardoise", - "block.mineralogy.slate_smooth_furnace": "Fourneau d'ardoise poli", - "block.mineralogy.slate_smooth_brick_furnace": "Ardoise polie mur de briques", - "block.mineralogy.schist_furnace": "Fourneau de schiste", - "block.mineralogy.schist_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.schist_smooth_furnace": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_furnace": "Fourneau de briques schist poli", - "block.mineralogy.gneiss_furnace": "Fourneau de gneiss", - "block.mineralogy.gneiss_brick_furnace": "Fourneau de briques en gneiss", - "block.mineralogy.gneiss_smooth_furnace": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_furnace": "Fourneau de phyllite", - "block.mineralogy.phyllite_brick_furnace": "Fourneau de briques de phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau de briques poli en phyllite", - "block.mineralogy.amphibolite_furnace": "Fourneau d'amphibolite", - "block.mineralogy.amphibolite_brick_furnace": "Fourneau de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau de briques poli à l'amphibolite", + "block.mineralogy.drywall_black": "Plaque de plâtre noire", + "block.mineralogy.drywall_red": "Plaque de plâtre rouge", + "block.mineralogy.drywall_green": "Plaque de plâtre verte", + "block.mineralogy.drywall_brown": "Plaque de plâtre marron", + "block.mineralogy.drywall_blue": "Plaque de plâtre bleue", + "block.mineralogy.drywall_purple": "Plaque de plâtre violette", + "block.mineralogy.drywall_cyan": "Plaque de plâtre cyan", + "block.mineralogy.drywall_silver": "Plaque de plâtre gris clair", + "block.mineralogy.drywall_gray": "Plaque de plâtre grise", + "block.mineralogy.drywall_pink": "Plaque de plâtre rose", + "block.mineralogy.drywall_lime": "Plaque de plâtre vert citron", + "block.mineralogy.drywall_yellow": "Plaque de plâtre jaune", + "block.mineralogy.drywall_light_blue": "Plaque de plâtre bleu clair", + "block.mineralogy.drywall_magenta": "Plaque de plâtre magenta", + "block.mineralogy.drywall_orange": "Plaque de plâtre orange", + "block.mineralogy.drywall_white": "Plaque de plâtre blanche", + "block.mineralogy.andesite_wall": "Muret en Andésite", + "block.mineralogy.andesite_brick_wall": "Muret en briques de Andésite", + "block.mineralogy.andesite_smooth_wall": "Muret poli en Andésite", + "block.mineralogy.andesite_smooth_brick_wall": "Muret en briques polies de Andésite", + "block.mineralogy.basalt_wall": "Muret en Basalte", + "block.mineralogy.basalt_brick_wall": "Muret en briques de Basalte", + "block.mineralogy.basalt_smooth_wall": "Muret poli en Basalte", + "block.mineralogy.basalt_smooth_brick_wall": "Muret en briques polies de Basalte", + "block.mineralogy.diorite_wall": "Muret en Diorite", + "block.mineralogy.diorite_brick_wall": "Muret en briques de Diorite", + "block.mineralogy.diorite_smooth_wall": "Muret poli en Diorite", + "block.mineralogy.diorite_smooth_brick_wall": "Muret en briques polies de Diorite", + "block.mineralogy.granite_wall": "Muret en Granite", + "block.mineralogy.granite_brick_wall": "Muret en briques de Granite", + "block.mineralogy.granite_smooth_wall": "Muret poli en Granite", + "block.mineralogy.granite_smooth_brick_wall": "Muret en briques polies de Granite", + "block.mineralogy.rhyolite_wall": "Muret en Rhyolite", + "block.mineralogy.rhyolite_brick_wall": "Muret en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_wall": "Muret poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muret en briques polies de Rhyolite", + "block.mineralogy.pegmatite_wall": "Muret en Pegmatite", + "block.mineralogy.pegmatite_brick_wall": "Muret en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_wall": "Muret poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muret en briques polies de Pegmatite", + "block.mineralogy.shale_wall": "Muret en Schiste argileux", + "block.mineralogy.shale_brick_wall": "Muret en briques de Schiste argileux", + "block.mineralogy.shale_smooth_wall": "Muret poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_wall": "Muret en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_wall": "Muret en Conglomérat", + "block.mineralogy.conglomerate_brick_wall": "Muret en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_wall": "Muret poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muret en briques polies de Conglomérat", + "block.mineralogy.dolomite_wall": "Muret en Dolomie", + "block.mineralogy.dolomite_brick_wall": "Muret en briques de Dolomie", + "block.mineralogy.dolomite_smooth_wall": "Muret poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_wall": "Muret en briques polies de Dolomie", + "block.mineralogy.limestone_wall": "Muret en Calcaire", + "block.mineralogy.limestone_brick_wall": "Muret en briques de Calcaire", + "block.mineralogy.limestone_smooth_wall": "Muret poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_wall": "Muret en briques polies de Calcaire", + "block.mineralogy.marble_wall": "Muret en Marbre", + "block.mineralogy.marble_brick_wall": "Muret en briques de Marbre", + "block.mineralogy.marble_smooth_wall": "Muret poli en Marbre", + "block.mineralogy.marble_smooth_brick_wall": "Muret en briques polies de Marbre", + "block.mineralogy.slate_wall": "Muret en Ardoise", + "block.mineralogy.slate_brick_wall": "Muret en briques de Ardoise", + "block.mineralogy.slate_smooth_wall": "Muret poli en Ardoise", + "block.mineralogy.slate_smooth_brick_wall": "Muret en briques polies de Ardoise", + "block.mineralogy.schist_wall": "Muret en Micaschiste", + "block.mineralogy.schist_brick_wall": "Muret en briques de Micaschiste", + "block.mineralogy.schist_smooth_wall": "Muret poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_wall": "Muret en briques polies de Micaschiste", + "block.mineralogy.gneiss_wall": "Muret en Gneiss", + "block.mineralogy.gneiss_brick_wall": "Muret en briques de Gneiss", + "block.mineralogy.gneiss_smooth_wall": "Muret poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_wall": "Muret en briques polies de Gneiss", + "block.mineralogy.phyllite_wall": "Muret en Phyllade", + "block.mineralogy.phyllite_brick_wall": "Muret en briques de Phyllade", + "block.mineralogy.phyllite_smooth_wall": "Muret poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_wall": "Muret en briques polies de Phyllade", + "block.mineralogy.amphibolite_wall": "Muret en Amphibolite", + "block.mineralogy.amphibolite_brick_wall": "Muret en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_wall": "Muret poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muret en briques polies de Amphibolite", + "block.mineralogy.andesite_furnace": "Fourneau en Andésite", + "block.mineralogy.andesite_brick_furnace": "Fourneau en briques de Andésite", + "block.mineralogy.andesite_smooth_furnace": "Fourneau poli en Andésite", + "block.mineralogy.andesite_smooth_brick_furnace": "Fourneau en briques polies de Andésite", + "block.mineralogy.basalt_furnace": "Fourneau en Basalte", + "block.mineralogy.basalt_brick_furnace": "Fourneau en briques de Basalte", + "block.mineralogy.basalt_smooth_furnace": "Fourneau poli en Basalte", + "block.mineralogy.basalt_smooth_brick_furnace": "Fourneau en briques polies de Basalte", + "block.mineralogy.diorite_furnace": "Fourneau en Diorite", + "block.mineralogy.diorite_brick_furnace": "Fourneau en briques de Diorite", + "block.mineralogy.diorite_smooth_furnace": "Fourneau poli en Diorite", + "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau en briques polies de Diorite", + "block.mineralogy.granite_furnace": "Fourneau en Granite", + "block.mineralogy.granite_brick_furnace": "Fourneau en briques de Granite", + "block.mineralogy.granite_smooth_furnace": "Fourneau poli en Granite", + "block.mineralogy.granite_smooth_brick_furnace": "Fourneau en briques polies de Granite", + "block.mineralogy.rhyolite_furnace": "Fourneau en Rhyolite", + "block.mineralogy.rhyolite_brick_furnace": "Fourneau en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau en briques polies de Rhyolite", + "block.mineralogy.pegmatite_furnace": "Fourneau en Pegmatite", + "block.mineralogy.pegmatite_brick_furnace": "Fourneau en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau en briques polies de Pegmatite", + "block.mineralogy.shale_furnace": "Fourneau en Schiste argileux", + "block.mineralogy.shale_brick_furnace": "Fourneau en briques de Schiste argileux", + "block.mineralogy.shale_smooth_furnace": "Fourneau poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_furnace": "Fourneau en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_furnace": "Fourneau en Conglomérat", + "block.mineralogy.conglomerate_brick_furnace": "Fourneau en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_furnace": "Fourneau poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fourneau en briques polies de Conglomérat", + "block.mineralogy.dolomite_furnace": "Fourneau en Dolomie", + "block.mineralogy.dolomite_brick_furnace": "Fourneau en briques de Dolomie", + "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau en briques polies de Dolomie", + "block.mineralogy.limestone_furnace": "Fourneau en Calcaire", + "block.mineralogy.limestone_brick_furnace": "Fourneau en briques de Calcaire", + "block.mineralogy.limestone_smooth_furnace": "Fourneau poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau en briques polies de Calcaire", + "block.mineralogy.marble_furnace": "Fourneau en Marbre", + "block.mineralogy.marble_brick_furnace": "Fourneau en briques de Marbre", + "block.mineralogy.marble_smooth_furnace": "Fourneau poli en Marbre", + "block.mineralogy.marble_smooth_brick_furnace": "Fourneau en briques polies de Marbre", + "block.mineralogy.slate_furnace": "Fourneau en Ardoise", + "block.mineralogy.slate_brick_furnace": "Fourneau en briques de Ardoise", + "block.mineralogy.slate_smooth_furnace": "Fourneau poli en Ardoise", + "block.mineralogy.slate_smooth_brick_furnace": "Fourneau en briques polies de Ardoise", + "block.mineralogy.schist_furnace": "Fourneau en Micaschiste", + "block.mineralogy.schist_brick_furnace": "Fourneau en briques de Micaschiste", + "block.mineralogy.schist_smooth_furnace": "Fourneau poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_furnace": "Fourneau en briques polies de Micaschiste", + "block.mineralogy.gneiss_furnace": "Fourneau en Gneiss", + "block.mineralogy.gneiss_brick_furnace": "Fourneau en briques de Gneiss", + "block.mineralogy.gneiss_smooth_furnace": "Fourneau poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fourneau en briques polies de Gneiss", + "block.mineralogy.phyllite_furnace": "Fourneau en Phyllade", + "block.mineralogy.phyllite_brick_furnace": "Fourneau en briques de Phyllade", + "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau en briques polies de Phyllade", + "block.mineralogy.amphibolite_furnace": "Fourneau en Amphibolite", + "block.mineralogy.amphibolite_brick_furnace": "Fourneau en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau en briques polies de Amphibolite", "block.mineralogy.diabase": "Diabase", - "block.mineralogy.diabase_stairs": "Diabase Escaliers", - "block.mineralogy.diabase_slab": "Diabase Dalle", - "block.mineralogy.diabase_brick": "Diabase Brique", - "block.mineralogy.diabase_brick_stairs": "Diabase Escalier De Brique", - "block.mineralogy.diabase_brick_slab": "Diabase Dalle de brique", - "block.mineralogy.diabase_smooth": "Polished Diabase", - "block.mineralogy.diabase_smooth_stairs": "Diabase Escalier Poli", - "block.mineralogy.diabase_smooth_slab": "Diabase Dalle polie", - "block.mineralogy.diabase_smooth_brick": "Diabase Brique polie", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabase Escalier en brique polie", - "block.mineralogy.diabase_smooth_brick_slab": "Diabase Dalle de brique polie", - "block.mineralogy.diabase_wall": "Diabase Wall", - "block.mineralogy.diabase_brick_wall": "Diabase Mur de briques", - "block.mineralogy.diabase_smooth_wall": "Diabase Mur poli", - "block.mineralogy.diabase_smooth_brick_wall": "Diabase Mur de brique poli", - "block.mineralogy.diabase_furnace": "Diabase Furnace", - "block.mineralogy.diabase_brick_furnace": "Diabase Four à briques", - "block.mineralogy.diabase_smooth_furnace": "Diabase Four poli", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabase Four à brique polie", + "block.mineralogy.diabase_stairs": "Escalier en Diabase", + "block.mineralogy.diabase_slab": "Dalle en Diabase", + "block.mineralogy.diabase_brick": "Briques en Diabase", + "block.mineralogy.diabase_brick_stairs": "Escalier en briques de Diabase", + "block.mineralogy.diabase_brick_slab": "Dalle en briques de Diabase", + "block.mineralogy.diabase_smooth": "Bloc poli en Diabase", + "block.mineralogy.diabase_smooth_stairs": "Escalier poli en Diabase", + "block.mineralogy.diabase_smooth_slab": "Dalle polie en Diabase", + "block.mineralogy.diabase_smooth_brick": "Briques polies en Diabase", + "block.mineralogy.diabase_smooth_brick_stairs": "Escalier en briques polies de Diabase", + "block.mineralogy.diabase_smooth_brick_slab": "Dalle en briques polies de Diabase", + "block.mineralogy.diabase_wall": "Muret en Diabase", + "block.mineralogy.diabase_brick_wall": "Muret en briques de Diabase", + "block.mineralogy.diabase_smooth_wall": "Muret poli en Diabase", + "block.mineralogy.diabase_smooth_brick_wall": "Muret en briques polies de Diabase", + "block.mineralogy.diabase_furnace": "Fourneau en Diabase", + "block.mineralogy.diabase_brick_furnace": "Fourneau en briques de Diabase", + "block.mineralogy.diabase_smooth_furnace": "Fourneau poli en Diabase", + "block.mineralogy.diabase_smooth_brick_furnace": "Fourneau en briques polies de Diabase", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escaliers", - "block.mineralogy.gabbro_slab": "Gabbro Dalle", - "block.mineralogy.gabbro_brick": "Gabbro Brique", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escalier De Brique", - "block.mineralogy.gabbro_brick_slab": "Gabbro Dalle de brique", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escalier Poli", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Dalle polie", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Brique polie", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Escalier en brique polie", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Dalle de brique polie", - "block.mineralogy.gabbro_wall": "Gabbro Wall", - "block.mineralogy.gabbro_brick_wall": "Gabbro Mur de briques", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Mur poli", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Mur de brique poli", - "block.mineralogy.gabbro_furnace": "Gabbro Furnace", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Four à briques", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Four poli", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Four à brique polie", + "block.mineralogy.gabbro_stairs": "Escalier en Gabbro", + "block.mineralogy.gabbro_slab": "Dalle en Gabbro", + "block.mineralogy.gabbro_brick": "Briques en Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Escalier en briques de Gabbro", + "block.mineralogy.gabbro_brick_slab": "Dalle en briques de Gabbro", + "block.mineralogy.gabbro_smooth": "Bloc poli en Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Escalier poli en Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Dalle polie en Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Briques polies en Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escalier en briques polies de Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Dalle en briques polies de Gabbro", + "block.mineralogy.gabbro_wall": "Muret en Gabbro", + "block.mineralogy.gabbro_brick_wall": "Muret en briques de Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Muret poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muret en briques polies de Gabbro", + "block.mineralogy.gabbro_furnace": "Fourneau en Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Fourneau en briques de Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Fourneau poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fourneau en briques polies de Gabbro", "block.mineralogy.peridotite": "Péridotite", - "block.mineralogy.peridotite_stairs": "Péridotite Escaliers", - "block.mineralogy.peridotite_slab": "Péridotite Dalle", - "block.mineralogy.peridotite_brick": "Péridotite Brique", - "block.mineralogy.peridotite_brick_stairs": "Péridotite Escalier De Brique", - "block.mineralogy.peridotite_brick_slab": "Péridotite Dalle de brique", - "block.mineralogy.peridotite_smooth": "Polished Péridotite", - "block.mineralogy.peridotite_smooth_stairs": "Péridotite Escalier Poli", - "block.mineralogy.peridotite_smooth_slab": "Péridotite Dalle polie", - "block.mineralogy.peridotite_smooth_brick": "Péridotite Brique polie", - "block.mineralogy.peridotite_smooth_brick_stairs": "Péridotite Escalier en brique polie", - "block.mineralogy.peridotite_smooth_brick_slab": "Péridotite Dalle de brique polie", - "block.mineralogy.peridotite_wall": "Péridotite Wall", - "block.mineralogy.peridotite_brick_wall": "Péridotite Mur de briques", - "block.mineralogy.peridotite_smooth_wall": "Péridotite Mur poli", - "block.mineralogy.peridotite_smooth_brick_wall": "Péridotite Mur de brique poli", - "block.mineralogy.peridotite_furnace": "Péridotite Furnace", - "block.mineralogy.peridotite_brick_furnace": "Péridotite Four à briques", - "block.mineralogy.peridotite_smooth_furnace": "Péridotite Four poli", - "block.mineralogy.peridotite_smooth_brick_furnace": "Péridotite Four à brique polie", + "block.mineralogy.peridotite_stairs": "Escalier en Péridotite", + "block.mineralogy.peridotite_slab": "Dalle en Péridotite", + "block.mineralogy.peridotite_brick": "Briques en Péridotite", + "block.mineralogy.peridotite_brick_stairs": "Escalier en briques de Péridotite", + "block.mineralogy.peridotite_brick_slab": "Dalle en briques de Péridotite", + "block.mineralogy.peridotite_smooth": "Bloc poli en Péridotite", + "block.mineralogy.peridotite_smooth_stairs": "Escalier poli en Péridotite", + "block.mineralogy.peridotite_smooth_slab": "Dalle polie en Péridotite", + "block.mineralogy.peridotite_smooth_brick": "Briques polies en Péridotite", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escalier en briques polies de Péridotite", + "block.mineralogy.peridotite_smooth_brick_slab": "Dalle en briques polies de Péridotite", + "block.mineralogy.peridotite_wall": "Muret en Péridotite", + "block.mineralogy.peridotite_brick_wall": "Muret en briques de Péridotite", + "block.mineralogy.peridotite_smooth_wall": "Muret poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_wall": "Muret en briques polies de Péridotite", + "block.mineralogy.peridotite_furnace": "Fourneau en Péridotite", + "block.mineralogy.peridotite_brick_furnace": "Fourneau en briques de Péridotite", + "block.mineralogy.peridotite_smooth_furnace": "Fourneau poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fourneau en briques polies de Péridotite", "block.mineralogy.basaltic_glass": "Verre basaltique", - "block.mineralogy.basaltic_glass_stairs": "Verre basaltique Escaliers", - "block.mineralogy.basaltic_glass_slab": "Verre basaltique Dalle", - "block.mineralogy.basaltic_glass_brick": "Verre basaltique Brique", - "block.mineralogy.basaltic_glass_brick_stairs": "Verre basaltique Escalier De Brique", - "block.mineralogy.basaltic_glass_brick_slab": "Verre basaltique Dalle de brique", - "block.mineralogy.basaltic_glass_smooth": "Polished Verre basaltique", - "block.mineralogy.basaltic_glass_smooth_stairs": "Verre basaltique Escalier Poli", - "block.mineralogy.basaltic_glass_smooth_slab": "Verre basaltique Dalle polie", - "block.mineralogy.basaltic_glass_smooth_brick": "Verre basaltique Brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Verre basaltique Escalier en brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Verre basaltique Dalle de brique polie", - "block.mineralogy.basaltic_glass_wall": "Verre basaltique Wall", - "block.mineralogy.basaltic_glass_brick_wall": "Verre basaltique Mur de briques", - "block.mineralogy.basaltic_glass_smooth_wall": "Verre basaltique Mur poli", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Verre basaltique Mur de brique poli", - "block.mineralogy.basaltic_glass_furnace": "Verre basaltique Furnace", - "block.mineralogy.basaltic_glass_brick_furnace": "Verre basaltique Four à briques", - "block.mineralogy.basaltic_glass_smooth_furnace": "Verre basaltique Four poli", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Verre basaltique Four à brique polie", - "block.mineralogy.scoria": "Scories", - "block.mineralogy.scoria_stairs": "Scories Escaliers", - "block.mineralogy.scoria_slab": "Scories Dalle", - "block.mineralogy.scoria_brick": "Scories Brique", - "block.mineralogy.scoria_brick_stairs": "Scories Escalier De Brique", - "block.mineralogy.scoria_brick_slab": "Scories Dalle de brique", - "block.mineralogy.scoria_smooth": "Polished Scories", - "block.mineralogy.scoria_smooth_stairs": "Scories Escalier Poli", - "block.mineralogy.scoria_smooth_slab": "Scories Dalle polie", - "block.mineralogy.scoria_smooth_brick": "Scories Brique polie", - "block.mineralogy.scoria_smooth_brick_stairs": "Scories Escalier en brique polie", - "block.mineralogy.scoria_smooth_brick_slab": "Scories Dalle de brique polie", - "block.mineralogy.scoria_wall": "Scories Wall", - "block.mineralogy.scoria_brick_wall": "Scories Mur de briques", - "block.mineralogy.scoria_smooth_wall": "Scories Mur poli", - "block.mineralogy.scoria_smooth_brick_wall": "Scories Mur de brique poli", - "block.mineralogy.scoria_furnace": "Scories Furnace", - "block.mineralogy.scoria_brick_furnace": "Scories Four à briques", - "block.mineralogy.scoria_smooth_furnace": "Scories Four poli", - "block.mineralogy.scoria_smooth_brick_furnace": "Scories Four à brique polie", + "block.mineralogy.basaltic_glass_stairs": "Escalier en Verre basaltique", + "block.mineralogy.basaltic_glass_slab": "Dalle en Verre basaltique", + "block.mineralogy.basaltic_glass_brick": "Briques en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_stairs": "Escalier en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_brick_slab": "Dalle en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth": "Bloc poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escalier poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_slab": "Dalle polie en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick": "Briques polies en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escalier en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Dalle en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_wall": "Muret en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_wall": "Muret en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_wall": "Muret poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muret en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_furnace": "Fourneau en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_furnace": "Fourneau en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fourneau poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fourneau en briques polies de Verre basaltique", + "block.mineralogy.scoria": "Scorie", + "block.mineralogy.scoria_stairs": "Escalier en Scorie", + "block.mineralogy.scoria_slab": "Dalle en Scorie", + "block.mineralogy.scoria_brick": "Briques en Scorie", + "block.mineralogy.scoria_brick_stairs": "Escalier en briques de Scorie", + "block.mineralogy.scoria_brick_slab": "Dalle en briques de Scorie", + "block.mineralogy.scoria_smooth": "Bloc poli en Scorie", + "block.mineralogy.scoria_smooth_stairs": "Escalier poli en Scorie", + "block.mineralogy.scoria_smooth_slab": "Dalle polie en Scorie", + "block.mineralogy.scoria_smooth_brick": "Briques polies en Scorie", + "block.mineralogy.scoria_smooth_brick_stairs": "Escalier en briques polies de Scorie", + "block.mineralogy.scoria_smooth_brick_slab": "Dalle en briques polies de Scorie", + "block.mineralogy.scoria_wall": "Muret en Scorie", + "block.mineralogy.scoria_brick_wall": "Muret en briques de Scorie", + "block.mineralogy.scoria_smooth_wall": "Muret poli en Scorie", + "block.mineralogy.scoria_smooth_brick_wall": "Muret en briques polies de Scorie", + "block.mineralogy.scoria_furnace": "Fourneau en Scorie", + "block.mineralogy.scoria_brick_furnace": "Fourneau en briques de Scorie", + "block.mineralogy.scoria_smooth_furnace": "Fourneau poli en Scorie", + "block.mineralogy.scoria_smooth_brick_furnace": "Fourneau en briques polies de Scorie", "block.mineralogy.tuff": "Tuf", - "block.mineralogy.tuff_stairs": "Tuf Escaliers", - "block.mineralogy.tuff_slab": "Tuf Dalle", - "block.mineralogy.tuff_brick": "Tuf Brique", - "block.mineralogy.tuff_brick_stairs": "Tuf Escalier De Brique", - "block.mineralogy.tuff_brick_slab": "Tuf Dalle de brique", - "block.mineralogy.tuff_smooth": "Polished Tuf", - "block.mineralogy.tuff_smooth_stairs": "Tuf Escalier Poli", - "block.mineralogy.tuff_smooth_slab": "Tuf Dalle polie", - "block.mineralogy.tuff_smooth_brick": "Tuf Brique polie", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuf Escalier en brique polie", - "block.mineralogy.tuff_smooth_brick_slab": "Tuf Dalle de brique polie", - "block.mineralogy.tuff_wall": "Tuf Wall", - "block.mineralogy.tuff_brick_wall": "Tuf Mur de briques", - "block.mineralogy.tuff_smooth_wall": "Tuf Mur poli", - "block.mineralogy.tuff_smooth_brick_wall": "Tuf Mur de brique poli", - "block.mineralogy.tuff_furnace": "Tuf Furnace", - "block.mineralogy.tuff_brick_furnace": "Tuf Four à briques", - "block.mineralogy.tuff_smooth_furnace": "Tuf Four poli", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuf Four à brique polie", - "block.mineralogy.siltstone": "Pierre de terre", - "block.mineralogy.siltstone_stairs": "Pierre de terre Escaliers", - "block.mineralogy.siltstone_slab": "Pierre de terre Dalle", - "block.mineralogy.siltstone_brick": "Pierre de terre Brique", - "block.mineralogy.siltstone_brick_stairs": "Pierre de terre Escalier De Brique", - "block.mineralogy.siltstone_brick_slab": "Pierre de terre Dalle de brique", - "block.mineralogy.siltstone_smooth": "Polished Pierre de terre", - "block.mineralogy.siltstone_smooth_stairs": "Pierre de terre Escalier Poli", - "block.mineralogy.siltstone_smooth_slab": "Pierre de terre Dalle polie", - "block.mineralogy.siltstone_smooth_brick": "Pierre de terre Brique polie", - "block.mineralogy.siltstone_smooth_brick_stairs": "Pierre de terre Escalier en brique polie", - "block.mineralogy.siltstone_smooth_brick_slab": "Pierre de terre Dalle de brique polie", - "block.mineralogy.siltstone_wall": "Pierre de terre Wall", - "block.mineralogy.siltstone_brick_wall": "Pierre de terre Mur de briques", - "block.mineralogy.siltstone_smooth_wall": "Pierre de terre Mur poli", - "block.mineralogy.siltstone_smooth_brick_wall": "Pierre de terre Mur de brique poli", - "block.mineralogy.siltstone_furnace": "Pierre de terre Furnace", - "block.mineralogy.siltstone_brick_furnace": "Pierre de terre Four à briques", - "block.mineralogy.siltstone_smooth_furnace": "Pierre de terre Four poli", - "block.mineralogy.siltstone_smooth_brick_furnace": "Pierre de terre Four à brique polie", + "block.mineralogy.tuff_stairs": "Escalier en Tuf", + "block.mineralogy.tuff_slab": "Dalle en Tuf", + "block.mineralogy.tuff_brick": "Briques en Tuf", + "block.mineralogy.tuff_brick_stairs": "Escalier en briques de Tuf", + "block.mineralogy.tuff_brick_slab": "Dalle en briques de Tuf", + "block.mineralogy.tuff_smooth": "Bloc poli en Tuf", + "block.mineralogy.tuff_smooth_stairs": "Escalier poli en Tuf", + "block.mineralogy.tuff_smooth_slab": "Dalle polie en Tuf", + "block.mineralogy.tuff_smooth_brick": "Briques polies en Tuf", + "block.mineralogy.tuff_smooth_brick_stairs": "Escalier en briques polies de Tuf", + "block.mineralogy.tuff_smooth_brick_slab": "Dalle en briques polies de Tuf", + "block.mineralogy.tuff_wall": "Muret en Tuf", + "block.mineralogy.tuff_brick_wall": "Muret en briques de Tuf", + "block.mineralogy.tuff_smooth_wall": "Muret poli en Tuf", + "block.mineralogy.tuff_smooth_brick_wall": "Muret en briques polies de Tuf", + "block.mineralogy.tuff_furnace": "Fourneau en Tuf", + "block.mineralogy.tuff_brick_furnace": "Fourneau en briques de Tuf", + "block.mineralogy.tuff_smooth_furnace": "Fourneau poli en Tuf", + "block.mineralogy.tuff_smooth_brick_furnace": "Fourneau en briques polies de Tuf", + "block.mineralogy.siltstone": "Siltite", + "block.mineralogy.siltstone_stairs": "Escalier en Siltite", + "block.mineralogy.siltstone_slab": "Dalle en Siltite", + "block.mineralogy.siltstone_brick": "Briques en Siltite", + "block.mineralogy.siltstone_brick_stairs": "Escalier en briques de Siltite", + "block.mineralogy.siltstone_brick_slab": "Dalle en briques de Siltite", + "block.mineralogy.siltstone_smooth": "Bloc poli en Siltite", + "block.mineralogy.siltstone_smooth_stairs": "Escalier poli en Siltite", + "block.mineralogy.siltstone_smooth_slab": "Dalle polie en Siltite", + "block.mineralogy.siltstone_smooth_brick": "Briques polies en Siltite", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escalier en briques polies de Siltite", + "block.mineralogy.siltstone_smooth_brick_slab": "Dalle en briques polies de Siltite", + "block.mineralogy.siltstone_wall": "Muret en Siltite", + "block.mineralogy.siltstone_brick_wall": "Muret en briques de Siltite", + "block.mineralogy.siltstone_smooth_wall": "Muret poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_wall": "Muret en briques polies de Siltite", + "block.mineralogy.siltstone_furnace": "Fourneau en Siltite", + "block.mineralogy.siltstone_brick_furnace": "Fourneau en briques de Siltite", + "block.mineralogy.siltstone_smooth_furnace": "Fourneau poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fourneau en briques polies de Siltite", "block.mineralogy.rock_salt": "Sel gemme", - "block.mineralogy.rock_salt_stairs": "Sel gemme Escaliers", - "block.mineralogy.rock_salt_slab": "Sel gemme Dalle", - "block.mineralogy.rock_salt_brick": "Sel gemme Brique", - "block.mineralogy.rock_salt_brick_stairs": "Sel gemme Escalier De Brique", - "block.mineralogy.rock_salt_brick_slab": "Sel gemme Dalle de brique", - "block.mineralogy.rock_salt_smooth": "Polished Sel gemme", - "block.mineralogy.rock_salt_smooth_stairs": "Sel gemme Escalier Poli", - "block.mineralogy.rock_salt_smooth_slab": "Sel gemme Dalle polie", - "block.mineralogy.rock_salt_smooth_brick": "Sel gemme Brique polie", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sel gemme Escalier en brique polie", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sel gemme Dalle de brique polie", - "block.mineralogy.rock_salt_wall": "Sel gemme Wall", - "block.mineralogy.rock_salt_brick_wall": "Sel gemme Mur de briques", - "block.mineralogy.rock_salt_smooth_wall": "Sel gemme Mur poli", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sel gemme Mur de brique poli", - "block.mineralogy.rock_salt_furnace": "Sel gemme Furnace", - "block.mineralogy.rock_salt_brick_furnace": "Sel gemme Four à briques", - "block.mineralogy.rock_salt_smooth_furnace": "Sel gemme Four poli", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sel gemme Four à brique polie", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escaliers", - "block.mineralogy.hornfels_slab": "Hornfels Dalle", - "block.mineralogy.hornfels_brick": "Hornfels Brique", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escalier De Brique", - "block.mineralogy.hornfels_brick_slab": "Hornfels Dalle de brique", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escalier Poli", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Dalle polie", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Brique polie", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Escalier en brique polie", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Dalle de brique polie", - "block.mineralogy.hornfels_wall": "Hornfels Wall", - "block.mineralogy.hornfels_brick_wall": "Hornfels Mur de briques", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Mur poli", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Mur de brique poli", - "block.mineralogy.hornfels_furnace": "Hornfels Furnace", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Four à briques", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Four poli", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Four à brique polie", + "block.mineralogy.rock_salt_stairs": "Escalier en Sel gemme", + "block.mineralogy.rock_salt_slab": "Dalle en Sel gemme", + "block.mineralogy.rock_salt_brick": "Briques en Sel gemme", + "block.mineralogy.rock_salt_brick_stairs": "Escalier en briques de Sel gemme", + "block.mineralogy.rock_salt_brick_slab": "Dalle en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth": "Bloc poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_stairs": "Escalier poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_slab": "Dalle polie en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick": "Briques polies en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escalier en briques polies de Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_slab": "Dalle en briques polies de Sel gemme", + "block.mineralogy.rock_salt_wall": "Muret en Sel gemme", + "block.mineralogy.rock_salt_brick_wall": "Muret en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_wall": "Muret poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muret en briques polies de Sel gemme", + "block.mineralogy.rock_salt_furnace": "Fourneau en Sel gemme", + "block.mineralogy.rock_salt_brick_furnace": "Fourneau en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_furnace": "Fourneau poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fourneau en briques polies de Sel gemme", + "block.mineralogy.hornfels": "Cornéenne", + "block.mineralogy.hornfels_stairs": "Escalier en Cornéenne", + "block.mineralogy.hornfels_slab": "Dalle en Cornéenne", + "block.mineralogy.hornfels_brick": "Briques en Cornéenne", + "block.mineralogy.hornfels_brick_stairs": "Escalier en briques de Cornéenne", + "block.mineralogy.hornfels_brick_slab": "Dalle en briques de Cornéenne", + "block.mineralogy.hornfels_smooth": "Bloc poli en Cornéenne", + "block.mineralogy.hornfels_smooth_stairs": "Escalier poli en Cornéenne", + "block.mineralogy.hornfels_smooth_slab": "Dalle polie en Cornéenne", + "block.mineralogy.hornfels_smooth_brick": "Briques polies en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escalier en briques polies de Cornéenne", + "block.mineralogy.hornfels_smooth_brick_slab": "Dalle en briques polies de Cornéenne", + "block.mineralogy.hornfels_wall": "Muret en Cornéenne", + "block.mineralogy.hornfels_brick_wall": "Muret en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_wall": "Muret poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_wall": "Muret en briques polies de Cornéenne", + "block.mineralogy.hornfels_furnace": "Fourneau en Cornéenne", + "block.mineralogy.hornfels_brick_furnace": "Fourneau en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_furnace": "Fourneau poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fourneau en briques polies de Cornéenne", "block.mineralogy.quartzite": "Quartzite", - "block.mineralogy.quartzite_stairs": "Quartzite Escaliers", - "block.mineralogy.quartzite_slab": "Quartzite Dalle", - "block.mineralogy.quartzite_brick": "Quartzite Brique", - "block.mineralogy.quartzite_brick_stairs": "Quartzite Escalier De Brique", - "block.mineralogy.quartzite_brick_slab": "Quartzite Dalle de brique", - "block.mineralogy.quartzite_smooth": "Polished Quartzite", - "block.mineralogy.quartzite_smooth_stairs": "Quartzite Escalier Poli", - "block.mineralogy.quartzite_smooth_slab": "Quartzite Dalle polie", - "block.mineralogy.quartzite_smooth_brick": "Quartzite Brique polie", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quartzite Escalier en brique polie", - "block.mineralogy.quartzite_smooth_brick_slab": "Quartzite Dalle de brique polie", - "block.mineralogy.quartzite_wall": "Quartzite Wall", - "block.mineralogy.quartzite_brick_wall": "Quartzite Mur de briques", - "block.mineralogy.quartzite_smooth_wall": "Quartzite Mur poli", - "block.mineralogy.quartzite_smooth_brick_wall": "Quartzite Mur de brique poli", - "block.mineralogy.quartzite_furnace": "Quartzite Furnace", - "block.mineralogy.quartzite_brick_furnace": "Quartzite Four à briques", - "block.mineralogy.quartzite_smooth_furnace": "Quartzite Four poli", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quartzite Four à brique polie", + "block.mineralogy.quartzite_stairs": "Escalier en Quartzite", + "block.mineralogy.quartzite_slab": "Dalle en Quartzite", + "block.mineralogy.quartzite_brick": "Briques en Quartzite", + "block.mineralogy.quartzite_brick_stairs": "Escalier en briques de Quartzite", + "block.mineralogy.quartzite_brick_slab": "Dalle en briques de Quartzite", + "block.mineralogy.quartzite_smooth": "Bloc poli en Quartzite", + "block.mineralogy.quartzite_smooth_stairs": "Escalier poli en Quartzite", + "block.mineralogy.quartzite_smooth_slab": "Dalle polie en Quartzite", + "block.mineralogy.quartzite_smooth_brick": "Briques polies en Quartzite", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escalier en briques polies de Quartzite", + "block.mineralogy.quartzite_smooth_brick_slab": "Dalle en briques polies de Quartzite", + "block.mineralogy.quartzite_wall": "Muret en Quartzite", + "block.mineralogy.quartzite_brick_wall": "Muret en briques de Quartzite", + "block.mineralogy.quartzite_smooth_wall": "Muret poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_wall": "Muret en briques polies de Quartzite", + "block.mineralogy.quartzite_furnace": "Fourneau en Quartzite", + "block.mineralogy.quartzite_brick_furnace": "Fourneau en briques de Quartzite", + "block.mineralogy.quartzite_smooth_furnace": "Fourneau poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fourneau en briques polies de Quartzite", "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Escaliers", - "block.mineralogy.novaculite_slab": "Novaculite Dalle", - "block.mineralogy.novaculite_brick": "Novaculite Brique", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Escalier De Brique", - "block.mineralogy.novaculite_brick_slab": "Novaculite Dalle de brique", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Escalier Poli", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Dalle polie", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Brique polie", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Escalier en brique polie", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Dalle de brique polie", - "block.mineralogy.novaculite_wall": "Novaculite Wall", - "block.mineralogy.novaculite_brick_wall": "Novaculite Mur de briques", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Mur poli", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Mur de brique poli", - "block.mineralogy.novaculite_furnace": "Novaculite Furnace", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Four à briques", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Four poli", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Four à brique polie", + "block.mineralogy.novaculite_stairs": "Escalier en Novaculite", + "block.mineralogy.novaculite_slab": "Dalle en Novaculite", + "block.mineralogy.novaculite_brick": "Briques en Novaculite", + "block.mineralogy.novaculite_brick_stairs": "Escalier en briques de Novaculite", + "block.mineralogy.novaculite_brick_slab": "Dalle en briques de Novaculite", + "block.mineralogy.novaculite_smooth": "Bloc poli en Novaculite", + "block.mineralogy.novaculite_smooth_stairs": "Escalier poli en Novaculite", + "block.mineralogy.novaculite_smooth_slab": "Dalle polie en Novaculite", + "block.mineralogy.novaculite_smooth_brick": "Briques polies en Novaculite", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escalier en briques polies de Novaculite", + "block.mineralogy.novaculite_smooth_brick_slab": "Dalle en briques polies de Novaculite", + "block.mineralogy.novaculite_wall": "Muret en Novaculite", + "block.mineralogy.novaculite_brick_wall": "Muret en briques de Novaculite", + "block.mineralogy.novaculite_smooth_wall": "Muret poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_wall": "Muret en briques polies de Novaculite", + "block.mineralogy.novaculite_furnace": "Fourneau en Novaculite", + "block.mineralogy.novaculite_brick_furnace": "Fourneau en briques de Novaculite", + "block.mineralogy.novaculite_smooth_furnace": "Fourneau poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fourneau en briques polies de Novaculite", "block.mineralogy.chalk": "Craie", "item.mineralogy.chalk_dust": "Poudre de craie", "item.mineralogy.salt_dust": "Sel", "item.mineralogy.rock_salt_dust": "Cristaux de sel gemme", - "block.mineralogy.rocksaltlamp": "Lampe à sel", - "block.mineralogy.rocksaltstreetlamp": "Lampadaire à sel", - "block.mineralogy.andesite_relief_axe": "Andésite Soulagement de la hache", - "block.mineralogy.andesite_relief_blank": "Andésite Relief vide", - "block.mineralogy.andesite_relief_cross": "Andésite Relief croisé", - "block.mineralogy.andesite_relief_hammer": "Andésite Soulagement marteau", - "block.mineralogy.andesite_relief_hoe": "Andésite Hoe Relief", - "block.mineralogy.andesite_relief_horizontal": "Andésite Relief horizontal", - "block.mineralogy.andesite_relief_i": "Andésite I Relief", - "block.mineralogy.andesite_relief_left": "Andésite Relief gauche", - "block.mineralogy.andesite_relief_pickaxe": "Andésite Relief de pioche", - "block.mineralogy.andesite_relief_plus": "Andésite Plus de soulagement", - "block.mineralogy.andesite_relief_right": "Andésite Bon soulagement", - "block.mineralogy.andesite_relief_sword": "Andésite Soulagement de l'épée", - "block.mineralogy.andesite_relief_vertical": "Andésite Relief vertical", - "block.mineralogy.basalt_relief_axe": "Basalte Soulagement de la hache", - "block.mineralogy.basalt_relief_blank": "Basalte Relief vide", - "block.mineralogy.basalt_relief_cross": "Basalte Relief croisé", - "block.mineralogy.basalt_relief_hammer": "Basalte Soulagement marteau", - "block.mineralogy.basalt_relief_hoe": "Basalte Hoe Relief", - "block.mineralogy.basalt_relief_horizontal": "Basalte Relief horizontal", - "block.mineralogy.basalt_relief_i": "Basalte I Relief", - "block.mineralogy.basalt_relief_left": "Basalte Relief gauche", - "block.mineralogy.basalt_relief_pickaxe": "Basalte Relief de pioche", - "block.mineralogy.basalt_relief_plus": "Basalte Plus de soulagement", - "block.mineralogy.basalt_relief_right": "Basalte Bon soulagement", - "block.mineralogy.basalt_relief_sword": "Basalte Soulagement de l'épée", - "block.mineralogy.basalt_relief_vertical": "Basalte Relief vertical", - "block.mineralogy.diorite_relief_axe": "Diorite Soulagement de la hache", - "block.mineralogy.diorite_relief_blank": "Diorite Relief vide", - "block.mineralogy.diorite_relief_cross": "Diorite Relief croisé", - "block.mineralogy.diorite_relief_hammer": "Diorite Soulagement marteau", - "block.mineralogy.diorite_relief_hoe": "Diorite Hoe Relief", - "block.mineralogy.diorite_relief_horizontal": "Diorite Relief horizontal", - "block.mineralogy.diorite_relief_i": "Diorite I Relief", - "block.mineralogy.diorite_relief_left": "Diorite Relief gauche", - "block.mineralogy.diorite_relief_pickaxe": "Diorite Relief de pioche", - "block.mineralogy.diorite_relief_plus": "Diorite Plus de soulagement", - "block.mineralogy.diorite_relief_right": "Diorite Bon soulagement", - "block.mineralogy.diorite_relief_sword": "Diorite Soulagement de l'épée", - "block.mineralogy.diorite_relief_vertical": "Diorite Relief vertical", - "block.mineralogy.granite_relief_axe": "Granit Soulagement de la hache", - "block.mineralogy.granite_relief_blank": "Granit Relief vide", - "block.mineralogy.granite_relief_cross": "Granit Relief croisé", - "block.mineralogy.granite_relief_hammer": "Granit Soulagement marteau", - "block.mineralogy.granite_relief_hoe": "Granit Hoe Relief", - "block.mineralogy.granite_relief_horizontal": "Granit Relief horizontal", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief gauche", - "block.mineralogy.granite_relief_pickaxe": "Granit Relief de pioche", - "block.mineralogy.granite_relief_plus": "Granit Plus de soulagement", - "block.mineralogy.granite_relief_right": "Granit Bon soulagement", - "block.mineralogy.granite_relief_sword": "Granit Soulagement de l'épée", - "block.mineralogy.granite_relief_vertical": "Granit Relief vertical", - "block.mineralogy.rhyolite_relief_axe": "Rhyolite Soulagement de la hache", - "block.mineralogy.rhyolite_relief_blank": "Rhyolite Relief vide", - "block.mineralogy.rhyolite_relief_cross": "Rhyolite Relief croisé", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolite Soulagement marteau", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolite Hoe Relief", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolite Relief horizontal", - "block.mineralogy.rhyolite_relief_i": "Rhyolite I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolite Relief gauche", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolite Relief de pioche", - "block.mineralogy.rhyolite_relief_plus": "Rhyolite Plus de soulagement", - "block.mineralogy.rhyolite_relief_right": "Rhyolite Bon soulagement", - "block.mineralogy.rhyolite_relief_sword": "Rhyolite Soulagement de l'épée", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolite Relief vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatite Soulagement de la hache", - "block.mineralogy.pegmatite_relief_blank": "Pegmatite Relief vide", - "block.mineralogy.pegmatite_relief_cross": "Pegmatite Relief croisé", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatite Soulagement marteau", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatite Hoe Relief", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatite Relief horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatite I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatite Relief gauche", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatite Relief de pioche", - "block.mineralogy.pegmatite_relief_plus": "Pegmatite Plus de soulagement", - "block.mineralogy.pegmatite_relief_right": "Pegmatite Bon soulagement", - "block.mineralogy.pegmatite_relief_sword": "Pegmatite Soulagement de l'épée", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatite Relief vertical", - "block.mineralogy.shale_relief_axe": "Schistee argileux Soulagement de la hache", - "block.mineralogy.shale_relief_blank": "Schistee argileux Relief vide", - "block.mineralogy.shale_relief_cross": "Schistee argileux Relief croisé", - "block.mineralogy.shale_relief_hammer": "Schistee argileux Soulagement marteau", - "block.mineralogy.shale_relief_hoe": "Schistee argileux Hoe Relief", - "block.mineralogy.shale_relief_horizontal": "Schistee argileux Relief horizontal", - "block.mineralogy.shale_relief_i": "Schistee argileux I Relief", - "block.mineralogy.shale_relief_left": "Schistee argileux Relief gauche", - "block.mineralogy.shale_relief_pickaxe": "Schistee argileux Relief de pioche", - "block.mineralogy.shale_relief_plus": "Schistee argileux Plus de soulagement", - "block.mineralogy.shale_relief_right": "Schistee argileux Bon soulagement", - "block.mineralogy.shale_relief_sword": "Schistee argileux Soulagement de l'épée", - "block.mineralogy.shale_relief_vertical": "Schistee argileux Relief vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomérat Soulagement de la hache", - "block.mineralogy.conglomerate_relief_blank": "Conglomérat Relief vide", - "block.mineralogy.conglomerate_relief_cross": "Conglomérat Relief croisé", - "block.mineralogy.conglomerate_relief_hammer": "Conglomérat Soulagement marteau", - "block.mineralogy.conglomerate_relief_hoe": "Conglomérat Hoe Relief", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomérat Relief horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomérat I Relief", - "block.mineralogy.conglomerate_relief_left": "Conglomérat Relief gauche", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomérat Relief de pioche", - "block.mineralogy.conglomerate_relief_plus": "Conglomérat Plus de soulagement", - "block.mineralogy.conglomerate_relief_right": "Conglomérat Bon soulagement", - "block.mineralogy.conglomerate_relief_sword": "Conglomérat Soulagement de l'épée", - "block.mineralogy.conglomerate_relief_vertical": "Conglomérat Relief vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomie Soulagement de la hache", - "block.mineralogy.dolomite_relief_blank": "Dolomie Relief vide", - "block.mineralogy.dolomite_relief_cross": "Dolomie Relief croisé", - "block.mineralogy.dolomite_relief_hammer": "Dolomie Soulagement marteau", - "block.mineralogy.dolomite_relief_hoe": "Dolomie Hoe Relief", - "block.mineralogy.dolomite_relief_horizontal": "Dolomie Relief horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomie I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomie Relief gauche", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomie Relief de pioche", - "block.mineralogy.dolomite_relief_plus": "Dolomie Plus de soulagement", - "block.mineralogy.dolomite_relief_right": "Dolomie Bon soulagement", - "block.mineralogy.dolomite_relief_sword": "Dolomie Soulagement de l'épée", - "block.mineralogy.dolomite_relief_vertical": "Dolomie Relief vertical", - "block.mineralogy.limestone_relief_axe": "Calcaire Soulagement de la hache", - "block.mineralogy.limestone_relief_blank": "Calcaire Relief vide", - "block.mineralogy.limestone_relief_cross": "Calcaire Relief croisé", - "block.mineralogy.limestone_relief_hammer": "Calcaire Soulagement marteau", - "block.mineralogy.limestone_relief_hoe": "Calcaire Hoe Relief", - "block.mineralogy.limestone_relief_horizontal": "Calcaire Relief horizontal", - "block.mineralogy.limestone_relief_i": "Calcaire I Relief", - "block.mineralogy.limestone_relief_left": "Calcaire Relief gauche", - "block.mineralogy.limestone_relief_pickaxe": "Calcaire Relief de pioche", - "block.mineralogy.limestone_relief_plus": "Calcaire Plus de soulagement", - "block.mineralogy.limestone_relief_right": "Calcaire Bon soulagement", - "block.mineralogy.limestone_relief_sword": "Calcaire Soulagement de l'épée", - "block.mineralogy.limestone_relief_vertical": "Calcaire Relief vertical", - "block.mineralogy.marble_relief_axe": "Marbre Soulagement de la hache", - "block.mineralogy.marble_relief_blank": "Marbre Relief vide", - "block.mineralogy.marble_relief_cross": "Marbre Relief croisé", - "block.mineralogy.marble_relief_hammer": "Marbre Soulagement marteau", - "block.mineralogy.marble_relief_hoe": "Marbre Hoe Relief", - "block.mineralogy.marble_relief_horizontal": "Marbre Relief horizontal", - "block.mineralogy.marble_relief_i": "Marbre I Relief", - "block.mineralogy.marble_relief_left": "Marbre Relief gauche", - "block.mineralogy.marble_relief_pickaxe": "Marbre Relief de pioche", - "block.mineralogy.marble_relief_plus": "Marbre Plus de soulagement", - "block.mineralogy.marble_relief_right": "Marbre Bon soulagement", - "block.mineralogy.marble_relief_sword": "Marbre Soulagement de l'épée", - "block.mineralogy.marble_relief_vertical": "Marbre Relief vertical", - "block.mineralogy.slate_relief_axe": "Ardoise Soulagement de la hache", - "block.mineralogy.slate_relief_blank": "Ardoise Relief vide", - "block.mineralogy.slate_relief_cross": "Ardoise Relief croisé", - "block.mineralogy.slate_relief_hammer": "Ardoise Soulagement marteau", - "block.mineralogy.slate_relief_hoe": "Ardoise Hoe Relief", - "block.mineralogy.slate_relief_horizontal": "Ardoise Relief horizontal", - "block.mineralogy.slate_relief_i": "Ardoise I Relief", - "block.mineralogy.slate_relief_left": "Ardoise Relief gauche", - "block.mineralogy.slate_relief_pickaxe": "Ardoise Relief de pioche", - "block.mineralogy.slate_relief_plus": "Ardoise Plus de soulagement", - "block.mineralogy.slate_relief_right": "Ardoise Bon soulagement", - "block.mineralogy.slate_relief_sword": "Ardoise Soulagement de l'épée", - "block.mineralogy.slate_relief_vertical": "Ardoise Relief vertical", - "block.mineralogy.schist_relief_axe": "Schiste Soulagement de la hache", - "block.mineralogy.schist_relief_blank": "Schiste Relief vide", - "block.mineralogy.schist_relief_cross": "Schiste Relief croisé", - "block.mineralogy.schist_relief_hammer": "Schiste Soulagement marteau", - "block.mineralogy.schist_relief_hoe": "Schiste Hoe Relief", - "block.mineralogy.schist_relief_horizontal": "Schiste Relief horizontal", - "block.mineralogy.schist_relief_i": "Schiste I Relief", - "block.mineralogy.schist_relief_left": "Schiste Relief gauche", - "block.mineralogy.schist_relief_pickaxe": "Schiste Relief de pioche", - "block.mineralogy.schist_relief_plus": "Schiste Plus de soulagement", - "block.mineralogy.schist_relief_right": "Schiste Bon soulagement", - "block.mineralogy.schist_relief_sword": "Schiste Soulagement de l'épée", - "block.mineralogy.schist_relief_vertical": "Schiste Relief vertical", - "block.mineralogy.gneiss_relief_axe": "Gneiss Soulagement de la hache", - "block.mineralogy.gneiss_relief_blank": "Gneiss Relief vide", - "block.mineralogy.gneiss_relief_cross": "Gneiss Relief croisé", - "block.mineralogy.gneiss_relief_hammer": "Gneiss Soulagement marteau", - "block.mineralogy.gneiss_relief_hoe": "Gneiss Hoe Relief", - "block.mineralogy.gneiss_relief_horizontal": "Gneiss Relief horizontal", - "block.mineralogy.gneiss_relief_i": "Gneiss I Relief", - "block.mineralogy.gneiss_relief_left": "Gneiss Relief gauche", - "block.mineralogy.gneiss_relief_pickaxe": "Gneiss Relief de pioche", - "block.mineralogy.gneiss_relief_plus": "Gneiss Plus de soulagement", - "block.mineralogy.gneiss_relief_right": "Gneiss Bon soulagement", - "block.mineralogy.gneiss_relief_sword": "Gneiss Soulagement de l'épée", - "block.mineralogy.gneiss_relief_vertical": "Gneiss Relief vertical", - "block.mineralogy.phyllite_relief_axe": "Phyllite Soulagement de la hache", - "block.mineralogy.phyllite_relief_blank": "Phyllite Relief vide", - "block.mineralogy.phyllite_relief_cross": "Phyllite Relief croisé", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Soulagement marteau", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hoe Relief", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Relief horizontal", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief gauche", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Relief de pioche", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus de soulagement", - "block.mineralogy.phyllite_relief_right": "Phyllite Bon soulagement", - "block.mineralogy.phyllite_relief_sword": "Phyllite Soulagement de l'épée", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Relief vertical", - "block.mineralogy.amphibolite_relief_axe": "Amphibolite Soulagement de la hache", - "block.mineralogy.amphibolite_relief_blank": "Amphibolite Relief vide", - "block.mineralogy.amphibolite_relief_cross": "Amphibolite Relief croisé", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolite Soulagement marteau", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolite Hoe Relief", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolite Relief horizontal", - "block.mineralogy.amphibolite_relief_i": "Amphibolite I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolite Relief gauche", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolite Relief de pioche", - "block.mineralogy.amphibolite_relief_plus": "Amphibolite Plus de soulagement", - "block.mineralogy.amphibolite_relief_right": "Amphibolite Bon soulagement", - "block.mineralogy.amphibolite_relief_sword": "Amphibolite Soulagement de l'épée", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolite Relief vertical", - "block.mineralogy.diabase_relief_axe": "Diabase Soulagement de la hache", - "block.mineralogy.diabase_relief_blank": "Diabase Relief vide", - "block.mineralogy.diabase_relief_cross": "Diabase Relief croisé", - "block.mineralogy.diabase_relief_hammer": "Diabase Soulagement marteau", - "block.mineralogy.diabase_relief_hoe": "Diabase Hoe Relief", - "block.mineralogy.diabase_relief_horizontal": "Diabase Relief horizontal", - "block.mineralogy.diabase_relief_i": "Diabase I Relief", - "block.mineralogy.diabase_relief_left": "Diabase Relief gauche", - "block.mineralogy.diabase_relief_pickaxe": "Diabase Relief de pioche", - "block.mineralogy.diabase_relief_plus": "Diabase Plus de soulagement", - "block.mineralogy.diabase_relief_right": "Diabase Bon soulagement", - "block.mineralogy.diabase_relief_sword": "Diabase Soulagement de l'épée", - "block.mineralogy.diabase_relief_vertical": "Diabase Relief vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Soulagement de la hache", - "block.mineralogy.gabbro_relief_blank": "Gabbro Relief vide", - "block.mineralogy.gabbro_relief_cross": "Gabbro Relief croisé", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Soulagement marteau", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hoe Relief", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Relief horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief gauche", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Relief de pioche", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus de soulagement", - "block.mineralogy.gabbro_relief_right": "Gabbro Bon soulagement", - "block.mineralogy.gabbro_relief_sword": "Gabbro Soulagement de l'épée", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Relief vertical", - "block.mineralogy.peridotite_relief_axe": "Péridotite Soulagement de la hache", - "block.mineralogy.peridotite_relief_blank": "Péridotite Relief vide", - "block.mineralogy.peridotite_relief_cross": "Péridotite Relief croisé", - "block.mineralogy.peridotite_relief_hammer": "Péridotite Soulagement marteau", - "block.mineralogy.peridotite_relief_hoe": "Péridotite Hoe Relief", - "block.mineralogy.peridotite_relief_horizontal": "Péridotite Relief horizontal", - "block.mineralogy.peridotite_relief_i": "Péridotite I Relief", - "block.mineralogy.peridotite_relief_left": "Péridotite Relief gauche", - "block.mineralogy.peridotite_relief_pickaxe": "Péridotite Relief de pioche", - "block.mineralogy.peridotite_relief_plus": "Péridotite Plus de soulagement", - "block.mineralogy.peridotite_relief_right": "Péridotite Bon soulagement", - "block.mineralogy.peridotite_relief_sword": "Péridotite Soulagement de l'épée", - "block.mineralogy.peridotite_relief_vertical": "Péridotite Relief vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Verre basaltique Soulagement de la hache", - "block.mineralogy.basaltic_glass_relief_blank": "Verre basaltique Relief vide", - "block.mineralogy.basaltic_glass_relief_cross": "Verre basaltique Relief croisé", - "block.mineralogy.basaltic_glass_relief_hammer": "Verre basaltique Soulagement marteau", - "block.mineralogy.basaltic_glass_relief_hoe": "Verre basaltique Hoe Relief", - "block.mineralogy.basaltic_glass_relief_horizontal": "Verre basaltique Relief horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Verre basaltique I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Verre basaltique Relief gauche", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Verre basaltique Relief de pioche", - "block.mineralogy.basaltic_glass_relief_plus": "Verre basaltique Plus de soulagement", - "block.mineralogy.basaltic_glass_relief_right": "Verre basaltique Bon soulagement", - "block.mineralogy.basaltic_glass_relief_sword": "Verre basaltique Soulagement de l'épée", - "block.mineralogy.basaltic_glass_relief_vertical": "Verre basaltique Relief vertical", - "block.mineralogy.scoria_relief_axe": "Scories Soulagement de la hache", - "block.mineralogy.scoria_relief_blank": "Scories Relief vide", - "block.mineralogy.scoria_relief_cross": "Scories Relief croisé", - "block.mineralogy.scoria_relief_hammer": "Scories Soulagement marteau", - "block.mineralogy.scoria_relief_hoe": "Scories Hoe Relief", - "block.mineralogy.scoria_relief_horizontal": "Scories Relief horizontal", - "block.mineralogy.scoria_relief_i": "Scories I Relief", - "block.mineralogy.scoria_relief_left": "Scories Relief gauche", - "block.mineralogy.scoria_relief_pickaxe": "Scories Relief de pioche", - "block.mineralogy.scoria_relief_plus": "Scories Plus de soulagement", - "block.mineralogy.scoria_relief_right": "Scories Bon soulagement", - "block.mineralogy.scoria_relief_sword": "Scories Soulagement de l'épée", - "block.mineralogy.scoria_relief_vertical": "Scories Relief vertical", - "block.mineralogy.tuff_relief_axe": "Tuf Soulagement de la hache", - "block.mineralogy.tuff_relief_blank": "Tuf Relief vide", - "block.mineralogy.tuff_relief_cross": "Tuf Relief croisé", - "block.mineralogy.tuff_relief_hammer": "Tuf Soulagement marteau", - "block.mineralogy.tuff_relief_hoe": "Tuf Hoe Relief", - "block.mineralogy.tuff_relief_horizontal": "Tuf Relief horizontal", - "block.mineralogy.tuff_relief_i": "Tuf I Relief", - "block.mineralogy.tuff_relief_left": "Tuf Relief gauche", - "block.mineralogy.tuff_relief_pickaxe": "Tuf Relief de pioche", - "block.mineralogy.tuff_relief_plus": "Tuf Plus de soulagement", - "block.mineralogy.tuff_relief_right": "Tuf Bon soulagement", - "block.mineralogy.tuff_relief_sword": "Tuf Soulagement de l'épée", - "block.mineralogy.tuff_relief_vertical": "Tuf Relief vertical", - "block.mineralogy.siltstone_relief_axe": "Pierre de terre Soulagement de la hache", - "block.mineralogy.siltstone_relief_blank": "Pierre de terre Relief vide", - "block.mineralogy.siltstone_relief_cross": "Pierre de terre Relief croisé", - "block.mineralogy.siltstone_relief_hammer": "Pierre de terre Soulagement marteau", - "block.mineralogy.siltstone_relief_hoe": "Pierre de terre Hoe Relief", - "block.mineralogy.siltstone_relief_horizontal": "Pierre de terre Relief horizontal", - "block.mineralogy.siltstone_relief_i": "Pierre de terre I Relief", - "block.mineralogy.siltstone_relief_left": "Pierre de terre Relief gauche", - "block.mineralogy.siltstone_relief_pickaxe": "Pierre de terre Relief de pioche", - "block.mineralogy.siltstone_relief_plus": "Pierre de terre Plus de soulagement", - "block.mineralogy.siltstone_relief_right": "Pierre de terre Bon soulagement", - "block.mineralogy.siltstone_relief_sword": "Pierre de terre Soulagement de l'épée", - "block.mineralogy.siltstone_relief_vertical": "Pierre de terre Relief vertical", - "block.mineralogy.rock_salt_relief_axe": "Sel gemme Soulagement de la hache", - "block.mineralogy.rock_salt_relief_blank": "Sel gemme Relief vide", - "block.mineralogy.rock_salt_relief_cross": "Sel gemme Relief croisé", - "block.mineralogy.rock_salt_relief_hammer": "Sel gemme Soulagement marteau", - "block.mineralogy.rock_salt_relief_hoe": "Sel gemme Hoe Relief", - "block.mineralogy.rock_salt_relief_horizontal": "Sel gemme Relief horizontal", - "block.mineralogy.rock_salt_relief_i": "Sel gemme I Relief", - "block.mineralogy.rock_salt_relief_left": "Sel gemme Relief gauche", - "block.mineralogy.rock_salt_relief_pickaxe": "Sel gemme Relief de pioche", - "block.mineralogy.rock_salt_relief_plus": "Sel gemme Plus de soulagement", - "block.mineralogy.rock_salt_relief_right": "Sel gemme Bon soulagement", - "block.mineralogy.rock_salt_relief_sword": "Sel gemme Soulagement de l'épée", - "block.mineralogy.rock_salt_relief_vertical": "Sel gemme Relief vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Soulagement de la hache", - "block.mineralogy.hornfels_relief_blank": "Hornfels Relief vide", - "block.mineralogy.hornfels_relief_cross": "Hornfels Relief croisé", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Soulagement marteau", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hoe Relief", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Relief horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief gauche", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Relief de pioche", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus de soulagement", - "block.mineralogy.hornfels_relief_right": "Hornfels Bon soulagement", - "block.mineralogy.hornfels_relief_sword": "Hornfels Soulagement de l'épée", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Relief vertical", - "block.mineralogy.quartzite_relief_axe": "Quartzite Soulagement de la hache", - "block.mineralogy.quartzite_relief_blank": "Quartzite Relief vide", - "block.mineralogy.quartzite_relief_cross": "Quartzite Relief croisé", - "block.mineralogy.quartzite_relief_hammer": "Quartzite Soulagement marteau", - "block.mineralogy.quartzite_relief_hoe": "Quartzite Hoe Relief", - "block.mineralogy.quartzite_relief_horizontal": "Quartzite Relief horizontal", - "block.mineralogy.quartzite_relief_i": "Quartzite I Relief", - "block.mineralogy.quartzite_relief_left": "Quartzite Relief gauche", - "block.mineralogy.quartzite_relief_pickaxe": "Quartzite Relief de pioche", - "block.mineralogy.quartzite_relief_plus": "Quartzite Plus de soulagement", - "block.mineralogy.quartzite_relief_right": "Quartzite Bon soulagement", - "block.mineralogy.quartzite_relief_sword": "Quartzite Soulagement de l'épée", - "block.mineralogy.quartzite_relief_vertical": "Quartzite Relief vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculite Soulagement de la hache", - "block.mineralogy.novaculite_relief_blank": "Novaculite Relief vide", - "block.mineralogy.novaculite_relief_cross": "Novaculite Relief croisé", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Soulagement marteau", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hoe Relief", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Relief horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief gauche", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Relief de pioche", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus de soulagement", - "block.mineralogy.novaculite_relief_right": "Novaculite Bon soulagement", - "block.mineralogy.novaculite_relief_sword": "Novaculite Soulagement de l'épée", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Relief vertical", - "advancements.mineralogy.all_the_rocks.title": "Appelez les rochers Ludo !", - "advancements.mineralogy.all_the_rocks.description": "Wow, vous avez trouvé tous les types de roches standards en minéralogie !", - "fluid.mineralogy.crude_oil": "Pétrole brut", - "block.mineralogy.crude_oil": "Pétrole brut", - "item.mineralogy.crude_oil_bucket": "Seau de pétrole brut", + "block.mineralogy.rocksaltlamp": "Lampe en sel gemme", + "block.mineralogy.rocksaltstreetlamp": "Réverbère en sel gemme", + "block.mineralogy.andesite_relief_axe": "Bas-relief en Andésite (hache)", + "block.mineralogy.andesite_relief_blank": "Bas-relief en Andésite (sans motif)", + "block.mineralogy.andesite_relief_cross": "Bas-relief en Andésite (croix)", + "block.mineralogy.andesite_relief_hammer": "Bas-relief en Andésite (marteau)", + "block.mineralogy.andesite_relief_hoe": "Bas-relief en Andésite (houe)", + "block.mineralogy.andesite_relief_horizontal": "Bas-relief en Andésite (horizontal)", + "block.mineralogy.andesite_relief_i": "Bas-relief en Andésite (I)", + "block.mineralogy.andesite_relief_left": "Bas-relief en Andésite (gauche)", + "block.mineralogy.andesite_relief_pickaxe": "Bas-relief en Andésite (pioche)", + "block.mineralogy.andesite_relief_plus": "Bas-relief en Andésite (signe plus)", + "block.mineralogy.andesite_relief_right": "Bas-relief en Andésite (droite)", + "block.mineralogy.andesite_relief_sword": "Bas-relief en Andésite (épée)", + "block.mineralogy.andesite_relief_vertical": "Bas-relief en Andésite (vertical)", + "block.mineralogy.basalt_relief_axe": "Bas-relief en Basalte (hache)", + "block.mineralogy.basalt_relief_blank": "Bas-relief en Basalte (sans motif)", + "block.mineralogy.basalt_relief_cross": "Bas-relief en Basalte (croix)", + "block.mineralogy.basalt_relief_hammer": "Bas-relief en Basalte (marteau)", + "block.mineralogy.basalt_relief_hoe": "Bas-relief en Basalte (houe)", + "block.mineralogy.basalt_relief_horizontal": "Bas-relief en Basalte (horizontal)", + "block.mineralogy.basalt_relief_i": "Bas-relief en Basalte (I)", + "block.mineralogy.basalt_relief_left": "Bas-relief en Basalte (gauche)", + "block.mineralogy.basalt_relief_pickaxe": "Bas-relief en Basalte (pioche)", + "block.mineralogy.basalt_relief_plus": "Bas-relief en Basalte (signe plus)", + "block.mineralogy.basalt_relief_right": "Bas-relief en Basalte (droite)", + "block.mineralogy.basalt_relief_sword": "Bas-relief en Basalte (épée)", + "block.mineralogy.basalt_relief_vertical": "Bas-relief en Basalte (vertical)", + "block.mineralogy.diorite_relief_axe": "Bas-relief en Diorite (hache)", + "block.mineralogy.diorite_relief_blank": "Bas-relief en Diorite (sans motif)", + "block.mineralogy.diorite_relief_cross": "Bas-relief en Diorite (croix)", + "block.mineralogy.diorite_relief_hammer": "Bas-relief en Diorite (marteau)", + "block.mineralogy.diorite_relief_hoe": "Bas-relief en Diorite (houe)", + "block.mineralogy.diorite_relief_horizontal": "Bas-relief en Diorite (horizontal)", + "block.mineralogy.diorite_relief_i": "Bas-relief en Diorite (I)", + "block.mineralogy.diorite_relief_left": "Bas-relief en Diorite (gauche)", + "block.mineralogy.diorite_relief_pickaxe": "Bas-relief en Diorite (pioche)", + "block.mineralogy.diorite_relief_plus": "Bas-relief en Diorite (signe plus)", + "block.mineralogy.diorite_relief_right": "Bas-relief en Diorite (droite)", + "block.mineralogy.diorite_relief_sword": "Bas-relief en Diorite (épée)", + "block.mineralogy.diorite_relief_vertical": "Bas-relief en Diorite (vertical)", + "block.mineralogy.granite_relief_axe": "Bas-relief en Granite (hache)", + "block.mineralogy.granite_relief_blank": "Bas-relief en Granite (sans motif)", + "block.mineralogy.granite_relief_cross": "Bas-relief en Granite (croix)", + "block.mineralogy.granite_relief_hammer": "Bas-relief en Granite (marteau)", + "block.mineralogy.granite_relief_hoe": "Bas-relief en Granite (houe)", + "block.mineralogy.granite_relief_horizontal": "Bas-relief en Granite (horizontal)", + "block.mineralogy.granite_relief_i": "Bas-relief en Granite (I)", + "block.mineralogy.granite_relief_left": "Bas-relief en Granite (gauche)", + "block.mineralogy.granite_relief_pickaxe": "Bas-relief en Granite (pioche)", + "block.mineralogy.granite_relief_plus": "Bas-relief en Granite (signe plus)", + "block.mineralogy.granite_relief_right": "Bas-relief en Granite (droite)", + "block.mineralogy.granite_relief_sword": "Bas-relief en Granite (épée)", + "block.mineralogy.granite_relief_vertical": "Bas-relief en Granite (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Bas-relief en Rhyolite (hache)", + "block.mineralogy.rhyolite_relief_blank": "Bas-relief en Rhyolite (sans motif)", + "block.mineralogy.rhyolite_relief_cross": "Bas-relief en Rhyolite (croix)", + "block.mineralogy.rhyolite_relief_hammer": "Bas-relief en Rhyolite (marteau)", + "block.mineralogy.rhyolite_relief_hoe": "Bas-relief en Rhyolite (houe)", + "block.mineralogy.rhyolite_relief_horizontal": "Bas-relief en Rhyolite (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Bas-relief en Rhyolite (I)", + "block.mineralogy.rhyolite_relief_left": "Bas-relief en Rhyolite (gauche)", + "block.mineralogy.rhyolite_relief_pickaxe": "Bas-relief en Rhyolite (pioche)", + "block.mineralogy.rhyolite_relief_plus": "Bas-relief en Rhyolite (signe plus)", + "block.mineralogy.rhyolite_relief_right": "Bas-relief en Rhyolite (droite)", + "block.mineralogy.rhyolite_relief_sword": "Bas-relief en Rhyolite (épée)", + "block.mineralogy.rhyolite_relief_vertical": "Bas-relief en Rhyolite (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Bas-relief en Pegmatite (hache)", + "block.mineralogy.pegmatite_relief_blank": "Bas-relief en Pegmatite (sans motif)", + "block.mineralogy.pegmatite_relief_cross": "Bas-relief en Pegmatite (croix)", + "block.mineralogy.pegmatite_relief_hammer": "Bas-relief en Pegmatite (marteau)", + "block.mineralogy.pegmatite_relief_hoe": "Bas-relief en Pegmatite (houe)", + "block.mineralogy.pegmatite_relief_horizontal": "Bas-relief en Pegmatite (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Bas-relief en Pegmatite (I)", + "block.mineralogy.pegmatite_relief_left": "Bas-relief en Pegmatite (gauche)", + "block.mineralogy.pegmatite_relief_pickaxe": "Bas-relief en Pegmatite (pioche)", + "block.mineralogy.pegmatite_relief_plus": "Bas-relief en Pegmatite (signe plus)", + "block.mineralogy.pegmatite_relief_right": "Bas-relief en Pegmatite (droite)", + "block.mineralogy.pegmatite_relief_sword": "Bas-relief en Pegmatite (épée)", + "block.mineralogy.pegmatite_relief_vertical": "Bas-relief en Pegmatite (vertical)", + "block.mineralogy.shale_relief_axe": "Bas-relief en Schiste argileux (hache)", + "block.mineralogy.shale_relief_blank": "Bas-relief en Schiste argileux (sans motif)", + "block.mineralogy.shale_relief_cross": "Bas-relief en Schiste argileux (croix)", + "block.mineralogy.shale_relief_hammer": "Bas-relief en Schiste argileux (marteau)", + "block.mineralogy.shale_relief_hoe": "Bas-relief en Schiste argileux (houe)", + "block.mineralogy.shale_relief_horizontal": "Bas-relief en Schiste argileux (horizontal)", + "block.mineralogy.shale_relief_i": "Bas-relief en Schiste argileux (I)", + "block.mineralogy.shale_relief_left": "Bas-relief en Schiste argileux (gauche)", + "block.mineralogy.shale_relief_pickaxe": "Bas-relief en Schiste argileux (pioche)", + "block.mineralogy.shale_relief_plus": "Bas-relief en Schiste argileux (signe plus)", + "block.mineralogy.shale_relief_right": "Bas-relief en Schiste argileux (droite)", + "block.mineralogy.shale_relief_sword": "Bas-relief en Schiste argileux (épée)", + "block.mineralogy.shale_relief_vertical": "Bas-relief en Schiste argileux (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Bas-relief en Conglomérat (hache)", + "block.mineralogy.conglomerate_relief_blank": "Bas-relief en Conglomérat (sans motif)", + "block.mineralogy.conglomerate_relief_cross": "Bas-relief en Conglomérat (croix)", + "block.mineralogy.conglomerate_relief_hammer": "Bas-relief en Conglomérat (marteau)", + "block.mineralogy.conglomerate_relief_hoe": "Bas-relief en Conglomérat (houe)", + "block.mineralogy.conglomerate_relief_horizontal": "Bas-relief en Conglomérat (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Bas-relief en Conglomérat (I)", + "block.mineralogy.conglomerate_relief_left": "Bas-relief en Conglomérat (gauche)", + "block.mineralogy.conglomerate_relief_pickaxe": "Bas-relief en Conglomérat (pioche)", + "block.mineralogy.conglomerate_relief_plus": "Bas-relief en Conglomérat (signe plus)", + "block.mineralogy.conglomerate_relief_right": "Bas-relief en Conglomérat (droite)", + "block.mineralogy.conglomerate_relief_sword": "Bas-relief en Conglomérat (épée)", + "block.mineralogy.conglomerate_relief_vertical": "Bas-relief en Conglomérat (vertical)", + "block.mineralogy.dolomite_relief_axe": "Bas-relief en Dolomie (hache)", + "block.mineralogy.dolomite_relief_blank": "Bas-relief en Dolomie (sans motif)", + "block.mineralogy.dolomite_relief_cross": "Bas-relief en Dolomie (croix)", + "block.mineralogy.dolomite_relief_hammer": "Bas-relief en Dolomie (marteau)", + "block.mineralogy.dolomite_relief_hoe": "Bas-relief en Dolomie (houe)", + "block.mineralogy.dolomite_relief_horizontal": "Bas-relief en Dolomie (horizontal)", + "block.mineralogy.dolomite_relief_i": "Bas-relief en Dolomie (I)", + "block.mineralogy.dolomite_relief_left": "Bas-relief en Dolomie (gauche)", + "block.mineralogy.dolomite_relief_pickaxe": "Bas-relief en Dolomie (pioche)", + "block.mineralogy.dolomite_relief_plus": "Bas-relief en Dolomie (signe plus)", + "block.mineralogy.dolomite_relief_right": "Bas-relief en Dolomie (droite)", + "block.mineralogy.dolomite_relief_sword": "Bas-relief en Dolomie (épée)", + "block.mineralogy.dolomite_relief_vertical": "Bas-relief en Dolomie (vertical)", + "block.mineralogy.limestone_relief_axe": "Bas-relief en Calcaire (hache)", + "block.mineralogy.limestone_relief_blank": "Bas-relief en Calcaire (sans motif)", + "block.mineralogy.limestone_relief_cross": "Bas-relief en Calcaire (croix)", + "block.mineralogy.limestone_relief_hammer": "Bas-relief en Calcaire (marteau)", + "block.mineralogy.limestone_relief_hoe": "Bas-relief en Calcaire (houe)", + "block.mineralogy.limestone_relief_horizontal": "Bas-relief en Calcaire (horizontal)", + "block.mineralogy.limestone_relief_i": "Bas-relief en Calcaire (I)", + "block.mineralogy.limestone_relief_left": "Bas-relief en Calcaire (gauche)", + "block.mineralogy.limestone_relief_pickaxe": "Bas-relief en Calcaire (pioche)", + "block.mineralogy.limestone_relief_plus": "Bas-relief en Calcaire (signe plus)", + "block.mineralogy.limestone_relief_right": "Bas-relief en Calcaire (droite)", + "block.mineralogy.limestone_relief_sword": "Bas-relief en Calcaire (épée)", + "block.mineralogy.limestone_relief_vertical": "Bas-relief en Calcaire (vertical)", + "block.mineralogy.marble_relief_axe": "Bas-relief en Marbre (hache)", + "block.mineralogy.marble_relief_blank": "Bas-relief en Marbre (sans motif)", + "block.mineralogy.marble_relief_cross": "Bas-relief en Marbre (croix)", + "block.mineralogy.marble_relief_hammer": "Bas-relief en Marbre (marteau)", + "block.mineralogy.marble_relief_hoe": "Bas-relief en Marbre (houe)", + "block.mineralogy.marble_relief_horizontal": "Bas-relief en Marbre (horizontal)", + "block.mineralogy.marble_relief_i": "Bas-relief en Marbre (I)", + "block.mineralogy.marble_relief_left": "Bas-relief en Marbre (gauche)", + "block.mineralogy.marble_relief_pickaxe": "Bas-relief en Marbre (pioche)", + "block.mineralogy.marble_relief_plus": "Bas-relief en Marbre (signe plus)", + "block.mineralogy.marble_relief_right": "Bas-relief en Marbre (droite)", + "block.mineralogy.marble_relief_sword": "Bas-relief en Marbre (épée)", + "block.mineralogy.marble_relief_vertical": "Bas-relief en Marbre (vertical)", + "block.mineralogy.slate_relief_axe": "Bas-relief en Ardoise (hache)", + "block.mineralogy.slate_relief_blank": "Bas-relief en Ardoise (sans motif)", + "block.mineralogy.slate_relief_cross": "Bas-relief en Ardoise (croix)", + "block.mineralogy.slate_relief_hammer": "Bas-relief en Ardoise (marteau)", + "block.mineralogy.slate_relief_hoe": "Bas-relief en Ardoise (houe)", + "block.mineralogy.slate_relief_horizontal": "Bas-relief en Ardoise (horizontal)", + "block.mineralogy.slate_relief_i": "Bas-relief en Ardoise (I)", + "block.mineralogy.slate_relief_left": "Bas-relief en Ardoise (gauche)", + "block.mineralogy.slate_relief_pickaxe": "Bas-relief en Ardoise (pioche)", + "block.mineralogy.slate_relief_plus": "Bas-relief en Ardoise (signe plus)", + "block.mineralogy.slate_relief_right": "Bas-relief en Ardoise (droite)", + "block.mineralogy.slate_relief_sword": "Bas-relief en Ardoise (épée)", + "block.mineralogy.slate_relief_vertical": "Bas-relief en Ardoise (vertical)", + "block.mineralogy.schist_relief_axe": "Bas-relief en Micaschiste (hache)", + "block.mineralogy.schist_relief_blank": "Bas-relief en Micaschiste (sans motif)", + "block.mineralogy.schist_relief_cross": "Bas-relief en Micaschiste (croix)", + "block.mineralogy.schist_relief_hammer": "Bas-relief en Micaschiste (marteau)", + "block.mineralogy.schist_relief_hoe": "Bas-relief en Micaschiste (houe)", + "block.mineralogy.schist_relief_horizontal": "Bas-relief en Micaschiste (horizontal)", + "block.mineralogy.schist_relief_i": "Bas-relief en Micaschiste (I)", + "block.mineralogy.schist_relief_left": "Bas-relief en Micaschiste (gauche)", + "block.mineralogy.schist_relief_pickaxe": "Bas-relief en Micaschiste (pioche)", + "block.mineralogy.schist_relief_plus": "Bas-relief en Micaschiste (signe plus)", + "block.mineralogy.schist_relief_right": "Bas-relief en Micaschiste (droite)", + "block.mineralogy.schist_relief_sword": "Bas-relief en Micaschiste (épée)", + "block.mineralogy.schist_relief_vertical": "Bas-relief en Micaschiste (vertical)", + "block.mineralogy.gneiss_relief_axe": "Bas-relief en Gneiss (hache)", + "block.mineralogy.gneiss_relief_blank": "Bas-relief en Gneiss (sans motif)", + "block.mineralogy.gneiss_relief_cross": "Bas-relief en Gneiss (croix)", + "block.mineralogy.gneiss_relief_hammer": "Bas-relief en Gneiss (marteau)", + "block.mineralogy.gneiss_relief_hoe": "Bas-relief en Gneiss (houe)", + "block.mineralogy.gneiss_relief_horizontal": "Bas-relief en Gneiss (horizontal)", + "block.mineralogy.gneiss_relief_i": "Bas-relief en Gneiss (I)", + "block.mineralogy.gneiss_relief_left": "Bas-relief en Gneiss (gauche)", + "block.mineralogy.gneiss_relief_pickaxe": "Bas-relief en Gneiss (pioche)", + "block.mineralogy.gneiss_relief_plus": "Bas-relief en Gneiss (signe plus)", + "block.mineralogy.gneiss_relief_right": "Bas-relief en Gneiss (droite)", + "block.mineralogy.gneiss_relief_sword": "Bas-relief en Gneiss (épée)", + "block.mineralogy.gneiss_relief_vertical": "Bas-relief en Gneiss (vertical)", + "block.mineralogy.phyllite_relief_axe": "Bas-relief en Phyllade (hache)", + "block.mineralogy.phyllite_relief_blank": "Bas-relief en Phyllade (sans motif)", + "block.mineralogy.phyllite_relief_cross": "Bas-relief en Phyllade (croix)", + "block.mineralogy.phyllite_relief_hammer": "Bas-relief en Phyllade (marteau)", + "block.mineralogy.phyllite_relief_hoe": "Bas-relief en Phyllade (houe)", + "block.mineralogy.phyllite_relief_horizontal": "Bas-relief en Phyllade (horizontal)", + "block.mineralogy.phyllite_relief_i": "Bas-relief en Phyllade (I)", + "block.mineralogy.phyllite_relief_left": "Bas-relief en Phyllade (gauche)", + "block.mineralogy.phyllite_relief_pickaxe": "Bas-relief en Phyllade (pioche)", + "block.mineralogy.phyllite_relief_plus": "Bas-relief en Phyllade (signe plus)", + "block.mineralogy.phyllite_relief_right": "Bas-relief en Phyllade (droite)", + "block.mineralogy.phyllite_relief_sword": "Bas-relief en Phyllade (épée)", + "block.mineralogy.phyllite_relief_vertical": "Bas-relief en Phyllade (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Bas-relief en Amphibolite (hache)", + "block.mineralogy.amphibolite_relief_blank": "Bas-relief en Amphibolite (sans motif)", + "block.mineralogy.amphibolite_relief_cross": "Bas-relief en Amphibolite (croix)", + "block.mineralogy.amphibolite_relief_hammer": "Bas-relief en Amphibolite (marteau)", + "block.mineralogy.amphibolite_relief_hoe": "Bas-relief en Amphibolite (houe)", + "block.mineralogy.amphibolite_relief_horizontal": "Bas-relief en Amphibolite (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Bas-relief en Amphibolite (I)", + "block.mineralogy.amphibolite_relief_left": "Bas-relief en Amphibolite (gauche)", + "block.mineralogy.amphibolite_relief_pickaxe": "Bas-relief en Amphibolite (pioche)", + "block.mineralogy.amphibolite_relief_plus": "Bas-relief en Amphibolite (signe plus)", + "block.mineralogy.amphibolite_relief_right": "Bas-relief en Amphibolite (droite)", + "block.mineralogy.amphibolite_relief_sword": "Bas-relief en Amphibolite (épée)", + "block.mineralogy.amphibolite_relief_vertical": "Bas-relief en Amphibolite (vertical)", + "block.mineralogy.diabase_relief_axe": "Bas-relief en Diabase (hache)", + "block.mineralogy.diabase_relief_blank": "Bas-relief en Diabase (sans motif)", + "block.mineralogy.diabase_relief_cross": "Bas-relief en Diabase (croix)", + "block.mineralogy.diabase_relief_hammer": "Bas-relief en Diabase (marteau)", + "block.mineralogy.diabase_relief_hoe": "Bas-relief en Diabase (houe)", + "block.mineralogy.diabase_relief_horizontal": "Bas-relief en Diabase (horizontal)", + "block.mineralogy.diabase_relief_i": "Bas-relief en Diabase (I)", + "block.mineralogy.diabase_relief_left": "Bas-relief en Diabase (gauche)", + "block.mineralogy.diabase_relief_pickaxe": "Bas-relief en Diabase (pioche)", + "block.mineralogy.diabase_relief_plus": "Bas-relief en Diabase (signe plus)", + "block.mineralogy.diabase_relief_right": "Bas-relief en Diabase (droite)", + "block.mineralogy.diabase_relief_sword": "Bas-relief en Diabase (épée)", + "block.mineralogy.diabase_relief_vertical": "Bas-relief en Diabase (vertical)", + "block.mineralogy.gabbro_relief_axe": "Bas-relief en Gabbro (hache)", + "block.mineralogy.gabbro_relief_blank": "Bas-relief en Gabbro (sans motif)", + "block.mineralogy.gabbro_relief_cross": "Bas-relief en Gabbro (croix)", + "block.mineralogy.gabbro_relief_hammer": "Bas-relief en Gabbro (marteau)", + "block.mineralogy.gabbro_relief_hoe": "Bas-relief en Gabbro (houe)", + "block.mineralogy.gabbro_relief_horizontal": "Bas-relief en Gabbro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Bas-relief en Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Bas-relief en Gabbro (gauche)", + "block.mineralogy.gabbro_relief_pickaxe": "Bas-relief en Gabbro (pioche)", + "block.mineralogy.gabbro_relief_plus": "Bas-relief en Gabbro (signe plus)", + "block.mineralogy.gabbro_relief_right": "Bas-relief en Gabbro (droite)", + "block.mineralogy.gabbro_relief_sword": "Bas-relief en Gabbro (épée)", + "block.mineralogy.gabbro_relief_vertical": "Bas-relief en Gabbro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Bas-relief en Péridotite (hache)", + "block.mineralogy.peridotite_relief_blank": "Bas-relief en Péridotite (sans motif)", + "block.mineralogy.peridotite_relief_cross": "Bas-relief en Péridotite (croix)", + "block.mineralogy.peridotite_relief_hammer": "Bas-relief en Péridotite (marteau)", + "block.mineralogy.peridotite_relief_hoe": "Bas-relief en Péridotite (houe)", + "block.mineralogy.peridotite_relief_horizontal": "Bas-relief en Péridotite (horizontal)", + "block.mineralogy.peridotite_relief_i": "Bas-relief en Péridotite (I)", + "block.mineralogy.peridotite_relief_left": "Bas-relief en Péridotite (gauche)", + "block.mineralogy.peridotite_relief_pickaxe": "Bas-relief en Péridotite (pioche)", + "block.mineralogy.peridotite_relief_plus": "Bas-relief en Péridotite (signe plus)", + "block.mineralogy.peridotite_relief_right": "Bas-relief en Péridotite (droite)", + "block.mineralogy.peridotite_relief_sword": "Bas-relief en Péridotite (épée)", + "block.mineralogy.peridotite_relief_vertical": "Bas-relief en Péridotite (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Bas-relief en Verre basaltique (hache)", + "block.mineralogy.basaltic_glass_relief_blank": "Bas-relief en Verre basaltique (sans motif)", + "block.mineralogy.basaltic_glass_relief_cross": "Bas-relief en Verre basaltique (croix)", + "block.mineralogy.basaltic_glass_relief_hammer": "Bas-relief en Verre basaltique (marteau)", + "block.mineralogy.basaltic_glass_relief_hoe": "Bas-relief en Verre basaltique (houe)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Bas-relief en Verre basaltique (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Bas-relief en Verre basaltique (I)", + "block.mineralogy.basaltic_glass_relief_left": "Bas-relief en Verre basaltique (gauche)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Bas-relief en Verre basaltique (pioche)", + "block.mineralogy.basaltic_glass_relief_plus": "Bas-relief en Verre basaltique (signe plus)", + "block.mineralogy.basaltic_glass_relief_right": "Bas-relief en Verre basaltique (droite)", + "block.mineralogy.basaltic_glass_relief_sword": "Bas-relief en Verre basaltique (épée)", + "block.mineralogy.basaltic_glass_relief_vertical": "Bas-relief en Verre basaltique (vertical)", + "block.mineralogy.scoria_relief_axe": "Bas-relief en Scorie (hache)", + "block.mineralogy.scoria_relief_blank": "Bas-relief en Scorie (sans motif)", + "block.mineralogy.scoria_relief_cross": "Bas-relief en Scorie (croix)", + "block.mineralogy.scoria_relief_hammer": "Bas-relief en Scorie (marteau)", + "block.mineralogy.scoria_relief_hoe": "Bas-relief en Scorie (houe)", + "block.mineralogy.scoria_relief_horizontal": "Bas-relief en Scorie (horizontal)", + "block.mineralogy.scoria_relief_i": "Bas-relief en Scorie (I)", + "block.mineralogy.scoria_relief_left": "Bas-relief en Scorie (gauche)", + "block.mineralogy.scoria_relief_pickaxe": "Bas-relief en Scorie (pioche)", + "block.mineralogy.scoria_relief_plus": "Bas-relief en Scorie (signe plus)", + "block.mineralogy.scoria_relief_right": "Bas-relief en Scorie (droite)", + "block.mineralogy.scoria_relief_sword": "Bas-relief en Scorie (épée)", + "block.mineralogy.scoria_relief_vertical": "Bas-relief en Scorie (vertical)", + "block.mineralogy.tuff_relief_axe": "Bas-relief en Tuf (hache)", + "block.mineralogy.tuff_relief_blank": "Bas-relief en Tuf (sans motif)", + "block.mineralogy.tuff_relief_cross": "Bas-relief en Tuf (croix)", + "block.mineralogy.tuff_relief_hammer": "Bas-relief en Tuf (marteau)", + "block.mineralogy.tuff_relief_hoe": "Bas-relief en Tuf (houe)", + "block.mineralogy.tuff_relief_horizontal": "Bas-relief en Tuf (horizontal)", + "block.mineralogy.tuff_relief_i": "Bas-relief en Tuf (I)", + "block.mineralogy.tuff_relief_left": "Bas-relief en Tuf (gauche)", + "block.mineralogy.tuff_relief_pickaxe": "Bas-relief en Tuf (pioche)", + "block.mineralogy.tuff_relief_plus": "Bas-relief en Tuf (signe plus)", + "block.mineralogy.tuff_relief_right": "Bas-relief en Tuf (droite)", + "block.mineralogy.tuff_relief_sword": "Bas-relief en Tuf (épée)", + "block.mineralogy.tuff_relief_vertical": "Bas-relief en Tuf (vertical)", + "block.mineralogy.siltstone_relief_axe": "Bas-relief en Siltite (hache)", + "block.mineralogy.siltstone_relief_blank": "Bas-relief en Siltite (sans motif)", + "block.mineralogy.siltstone_relief_cross": "Bas-relief en Siltite (croix)", + "block.mineralogy.siltstone_relief_hammer": "Bas-relief en Siltite (marteau)", + "block.mineralogy.siltstone_relief_hoe": "Bas-relief en Siltite (houe)", + "block.mineralogy.siltstone_relief_horizontal": "Bas-relief en Siltite (horizontal)", + "block.mineralogy.siltstone_relief_i": "Bas-relief en Siltite (I)", + "block.mineralogy.siltstone_relief_left": "Bas-relief en Siltite (gauche)", + "block.mineralogy.siltstone_relief_pickaxe": "Bas-relief en Siltite (pioche)", + "block.mineralogy.siltstone_relief_plus": "Bas-relief en Siltite (signe plus)", + "block.mineralogy.siltstone_relief_right": "Bas-relief en Siltite (droite)", + "block.mineralogy.siltstone_relief_sword": "Bas-relief en Siltite (épée)", + "block.mineralogy.siltstone_relief_vertical": "Bas-relief en Siltite (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Bas-relief en Sel gemme (hache)", + "block.mineralogy.rock_salt_relief_blank": "Bas-relief en Sel gemme (sans motif)", + "block.mineralogy.rock_salt_relief_cross": "Bas-relief en Sel gemme (croix)", + "block.mineralogy.rock_salt_relief_hammer": "Bas-relief en Sel gemme (marteau)", + "block.mineralogy.rock_salt_relief_hoe": "Bas-relief en Sel gemme (houe)", + "block.mineralogy.rock_salt_relief_horizontal": "Bas-relief en Sel gemme (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Bas-relief en Sel gemme (I)", + "block.mineralogy.rock_salt_relief_left": "Bas-relief en Sel gemme (gauche)", + "block.mineralogy.rock_salt_relief_pickaxe": "Bas-relief en Sel gemme (pioche)", + "block.mineralogy.rock_salt_relief_plus": "Bas-relief en Sel gemme (signe plus)", + "block.mineralogy.rock_salt_relief_right": "Bas-relief en Sel gemme (droite)", + "block.mineralogy.rock_salt_relief_sword": "Bas-relief en Sel gemme (épée)", + "block.mineralogy.rock_salt_relief_vertical": "Bas-relief en Sel gemme (vertical)", + "block.mineralogy.hornfels_relief_axe": "Bas-relief en Cornéenne (hache)", + "block.mineralogy.hornfels_relief_blank": "Bas-relief en Cornéenne (sans motif)", + "block.mineralogy.hornfels_relief_cross": "Bas-relief en Cornéenne (croix)", + "block.mineralogy.hornfels_relief_hammer": "Bas-relief en Cornéenne (marteau)", + "block.mineralogy.hornfels_relief_hoe": "Bas-relief en Cornéenne (houe)", + "block.mineralogy.hornfels_relief_horizontal": "Bas-relief en Cornéenne (horizontal)", + "block.mineralogy.hornfels_relief_i": "Bas-relief en Cornéenne (I)", + "block.mineralogy.hornfels_relief_left": "Bas-relief en Cornéenne (gauche)", + "block.mineralogy.hornfels_relief_pickaxe": "Bas-relief en Cornéenne (pioche)", + "block.mineralogy.hornfels_relief_plus": "Bas-relief en Cornéenne (signe plus)", + "block.mineralogy.hornfels_relief_right": "Bas-relief en Cornéenne (droite)", + "block.mineralogy.hornfels_relief_sword": "Bas-relief en Cornéenne (épée)", + "block.mineralogy.hornfels_relief_vertical": "Bas-relief en Cornéenne (vertical)", + "block.mineralogy.quartzite_relief_axe": "Bas-relief en Quartzite (hache)", + "block.mineralogy.quartzite_relief_blank": "Bas-relief en Quartzite (sans motif)", + "block.mineralogy.quartzite_relief_cross": "Bas-relief en Quartzite (croix)", + "block.mineralogy.quartzite_relief_hammer": "Bas-relief en Quartzite (marteau)", + "block.mineralogy.quartzite_relief_hoe": "Bas-relief en Quartzite (houe)", + "block.mineralogy.quartzite_relief_horizontal": "Bas-relief en Quartzite (horizontal)", + "block.mineralogy.quartzite_relief_i": "Bas-relief en Quartzite (I)", + "block.mineralogy.quartzite_relief_left": "Bas-relief en Quartzite (gauche)", + "block.mineralogy.quartzite_relief_pickaxe": "Bas-relief en Quartzite (pioche)", + "block.mineralogy.quartzite_relief_plus": "Bas-relief en Quartzite (signe plus)", + "block.mineralogy.quartzite_relief_right": "Bas-relief en Quartzite (droite)", + "block.mineralogy.quartzite_relief_sword": "Bas-relief en Quartzite (épée)", + "block.mineralogy.quartzite_relief_vertical": "Bas-relief en Quartzite (vertical)", + "block.mineralogy.novaculite_relief_axe": "Bas-relief en Novaculite (hache)", + "block.mineralogy.novaculite_relief_blank": "Bas-relief en Novaculite (sans motif)", + "block.mineralogy.novaculite_relief_cross": "Bas-relief en Novaculite (croix)", + "block.mineralogy.novaculite_relief_hammer": "Bas-relief en Novaculite (marteau)", + "block.mineralogy.novaculite_relief_hoe": "Bas-relief en Novaculite (houe)", + "block.mineralogy.novaculite_relief_horizontal": "Bas-relief en Novaculite (horizontal)", + "block.mineralogy.novaculite_relief_i": "Bas-relief en Novaculite (I)", + "block.mineralogy.novaculite_relief_left": "Bas-relief en Novaculite (gauche)", + "block.mineralogy.novaculite_relief_pickaxe": "Bas-relief en Novaculite (pioche)", + "block.mineralogy.novaculite_relief_plus": "Bas-relief en Novaculite (signe plus)", + "block.mineralogy.novaculite_relief_right": "Bas-relief en Novaculite (droite)", + "block.mineralogy.novaculite_relief_sword": "Bas-relief en Novaculite (épée)", + "block.mineralogy.novaculite_relief_vertical": "Bas-relief en Novaculite (vertical)", "itemGroup.mineralogy.mineralogy": "Minéralogie", - "itemGroup.mineralogy.rock": "Roches minéralogiques", + "itemGroup.mineralogy.rock": "Roches de Minéralogie", "itemGroup.mineralogy.stair": "Escaliers de Minéralogie", - "itemGroup.mineralogy.slab": "Dalles de minéralogie", - "itemGroup.mineralogy.wall": "Murs de Minéralogie", - "itemGroup.mineralogy.item": "Objets de minéralogie" + "itemGroup.mineralogy.slab": "Dalles de Minéralogie", + "itemGroup.mineralogy.wall": "Murets de Minéralogie", + "itemGroup.mineralogy.item": "Objets de Minéralogie", + "block.mineralogy.crude_oil": "Pétrole brut", + "item.mineralogy.crude_oil_bucket": "Seau de pétrole brut", + "fluid.mineralogy.crude_oil": "Pétrole brut", + "advancements.mineralogy.all_the_rocks.title": "Toutes les roches", + "advancements.mineralogy.all_the_rocks.description": "Vous avez trouvé tous les types de roches standard de Mineralogy !" } diff --git a/src/main/resources/assets/mineralogy/lang/ja_jp.json b/src/main/resources/assets/mineralogy/lang/ja_jp.json index af005e1b6..16f64de12 100644 --- a/src/main/resources/assets/mineralogy/lang/ja_jp.json +++ b/src/main/resources/assets/mineralogy/lang/ja_jp.json @@ -1,201 +1,201 @@ { "block.mineralogy.andesite": "安山岩", "block.mineralogy.andesite_stairs": "安山岩の階段", - "block.mineralogy.andesite_slab": "安山岩のスラブ", + "block.mineralogy.andesite_slab": "安山岩のハーフブロック", "block.mineralogy.andesite_brick": "安山岩レンガ", - "block.mineralogy.andesite_brick_stairs": "安山岩のレンガの階段", - "block.mineralogy.andesite_brick_slab": "安山岩レンガ板", + "block.mineralogy.andesite_brick_stairs": "安山岩レンガの階段", + "block.mineralogy.andesite_brick_slab": "安山岩レンガのハーフブロック", "block.mineralogy.andesite_smooth": "磨かれた安山岩", - "block.mineralogy.andesite_smooth_stairs": "安山岩の磨かれた階段", - "block.mineralogy.andesite_smooth_slab": "安山岩研磨スラブ", - "block.mineralogy.andesite_smooth_brick": "安山岩磨きレンガ", - "block.mineralogy.andesite_smooth_brick_stairs": "安山岩の磨かれたレンガの階段", - "block.mineralogy.andesite_smooth_brick_slab": "安山岩の磨かれたレンガのスラブ", + "block.mineralogy.andesite_smooth_stairs": "磨かれた安山岩の階段", + "block.mineralogy.andesite_smooth_slab": "磨かれた安山岩のハーフブロック", + "block.mineralogy.andesite_smooth_brick": "磨かれた安山岩レンガ", + "block.mineralogy.andesite_smooth_brick_stairs": "磨かれた安山岩レンガの階段", + "block.mineralogy.andesite_smooth_brick_slab": "磨かれた安山岩レンガのハーフブロック", "block.mineralogy.basalt": "玄武岩", "block.mineralogy.basalt_stairs": "玄武岩の階段", - "block.mineralogy.basalt_slab": "玄武岩の板", + "block.mineralogy.basalt_slab": "玄武岩のハーフブロック", "block.mineralogy.basalt_brick": "玄武岩レンガ", - "block.mineralogy.basalt_brick_stairs": "玄武岩のレンガの階段", - "block.mineralogy.basalt_brick_slab": "玄武岩レンガ板", + "block.mineralogy.basalt_brick_stairs": "玄武岩レンガの階段", + "block.mineralogy.basalt_brick_slab": "玄武岩レンガのハーフブロック", "block.mineralogy.basalt_smooth": "磨かれた玄武岩", - "block.mineralogy.basalt_smooth_stairs": "玄武岩で磨かれた階段", - "block.mineralogy.basalt_smooth_slab": "玄武岩の磨かれたスラブ", - "block.mineralogy.basalt_smooth_brick": "玄武岩磨きレンガ", - "block.mineralogy.basalt_smooth_brick_stairs": "玄武岩で磨かれたレンガの階段", - "block.mineralogy.basalt_smooth_brick_slab": "玄武岩の磨かれたレンガのスラブ", + "block.mineralogy.basalt_smooth_stairs": "磨かれた玄武岩の階段", + "block.mineralogy.basalt_smooth_slab": "磨かれた玄武岩のハーフブロック", + "block.mineralogy.basalt_smooth_brick": "磨かれた玄武岩レンガ", + "block.mineralogy.basalt_smooth_brick_stairs": "磨かれた玄武岩レンガの階段", + "block.mineralogy.basalt_smooth_brick_slab": "磨かれた玄武岩レンガのハーフブロック", "block.mineralogy.diorite": "閃緑岩", "block.mineralogy.diorite_stairs": "閃緑岩の階段", - "block.mineralogy.diorite_slab": "閃緑岩のスラブ", + "block.mineralogy.diorite_slab": "閃緑岩のハーフブロック", "block.mineralogy.diorite_brick": "閃緑岩レンガ", - "block.mineralogy.diorite_brick_stairs": "閃緑岩のレンガの階段", - "block.mineralogy.diorite_brick_slab": "閃緑岩レンガ板", + "block.mineralogy.diorite_brick_stairs": "閃緑岩レンガの階段", + "block.mineralogy.diorite_brick_slab": "閃緑岩レンガのハーフブロック", "block.mineralogy.diorite_smooth": "磨かれた閃緑岩", - "block.mineralogy.diorite_smooth_stairs": "閃緑岩の磨かれた階段", - "block.mineralogy.diorite_smooth_slab": "閃緑岩の研磨スラブ", - "block.mineralogy.diorite_smooth_brick": "閃緑岩磨きレンガ", - "block.mineralogy.diorite_smooth_brick_stairs": "閃緑岩の磨かれたレンガの階段", - "block.mineralogy.diorite_smooth_brick_slab": "閃緑岩の磨かれたレンガのスラブ", + "block.mineralogy.diorite_smooth_stairs": "磨かれた閃緑岩の階段", + "block.mineralogy.diorite_smooth_slab": "磨かれた閃緑岩のハーフブロック", + "block.mineralogy.diorite_smooth_brick": "磨かれた閃緑岩レンガ", + "block.mineralogy.diorite_smooth_brick_stairs": "磨かれた閃緑岩レンガの階段", + "block.mineralogy.diorite_smooth_brick_slab": "磨かれた閃緑岩レンガのハーフブロック", "block.mineralogy.granite": "花崗岩", "block.mineralogy.granite_stairs": "花崗岩の階段", - "block.mineralogy.granite_slab": "花崗岩のスラブ", + "block.mineralogy.granite_slab": "花崗岩のハーフブロック", "block.mineralogy.granite_brick": "花崗岩レンガ", - "block.mineralogy.granite_brick_stairs": "花崗岩のレンガの階段", - "block.mineralogy.granite_brick_slab": "花崗岩のレンガ板", + "block.mineralogy.granite_brick_stairs": "花崗岩レンガの階段", + "block.mineralogy.granite_brick_slab": "花崗岩レンガのハーフブロック", "block.mineralogy.granite_smooth": "磨かれた花崗岩", - "block.mineralogy.granite_smooth_stairs": "花崗岩の磨かれた階段", - "block.mineralogy.granite_smooth_slab": "花崗岩の磨かれたスラブ", - "block.mineralogy.granite_smooth_brick": "花崗岩の磨かれたレンガ", - "block.mineralogy.granite_smooth_brick_stairs": "花崗岩の磨かれたレンガの階段", - "block.mineralogy.granite_smooth_brick_slab": "花崗岩の磨かれたレンガのスラブ", + "block.mineralogy.granite_smooth_stairs": "磨かれた花崗岩の階段", + "block.mineralogy.granite_smooth_slab": "磨かれた花崗岩のハーフブロック", + "block.mineralogy.granite_smooth_brick": "磨かれた花崗岩レンガ", + "block.mineralogy.granite_smooth_brick_stairs": "磨かれた花崗岩レンガの階段", + "block.mineralogy.granite_smooth_brick_slab": "磨かれた花崗岩レンガのハーフブロック", "block.mineralogy.rhyolite": "流紋岩", "block.mineralogy.rhyolite_stairs": "流紋岩の階段", - "block.mineralogy.rhyolite_slab": "流紋岩のスラブ", + "block.mineralogy.rhyolite_slab": "流紋岩のハーフブロック", "block.mineralogy.rhyolite_brick": "流紋岩レンガ", - "block.mineralogy.rhyolite_brick_stairs": "流紋岩のレンガの階段", - "block.mineralogy.rhyolite_brick_slab": "流紋岩レンガ板", - "block.mineralogy.rhyolite_smooth": "研磨流紋岩", - "block.mineralogy.rhyolite_smooth_stairs": "流紋岩の磨かれた階段", - "block.mineralogy.rhyolite_smooth_slab": "流紋岩研磨スラブ", - "block.mineralogy.rhyolite_smooth_brick": "流紋岩磨きレンガ", - "block.mineralogy.rhyolite_smooth_brick_stairs": "流紋岩の磨かれたレンガの階段", - "block.mineralogy.rhyolite_smooth_brick_slab": "流紋岩研磨レンガスラブ", + "block.mineralogy.rhyolite_brick_stairs": "流紋岩レンガの階段", + "block.mineralogy.rhyolite_brick_slab": "流紋岩レンガのハーフブロック", + "block.mineralogy.rhyolite_smooth": "磨かれた流紋岩", + "block.mineralogy.rhyolite_smooth_stairs": "磨かれた流紋岩の階段", + "block.mineralogy.rhyolite_smooth_slab": "磨かれた流紋岩のハーフブロック", + "block.mineralogy.rhyolite_smooth_brick": "磨かれた流紋岩レンガ", + "block.mineralogy.rhyolite_smooth_brick_stairs": "磨かれた流紋岩レンガの階段", + "block.mineralogy.rhyolite_smooth_brick_slab": "磨かれた流紋岩レンガのハーフブロック", "block.mineralogy.pegmatite": "ペグマタイト", "block.mineralogy.pegmatite_stairs": "ペグマタイトの階段", - "block.mineralogy.pegmatite_slab": "ペグマタイトスラブ", + "block.mineralogy.pegmatite_slab": "ペグマタイトのハーフブロック", "block.mineralogy.pegmatite_brick": "ペグマタイトレンガ", "block.mineralogy.pegmatite_brick_stairs": "ペグマタイトレンガの階段", - "block.mineralogy.pegmatite_brick_slab": "ペグマタイト レンガ スラブ", - "block.mineralogy.pegmatite_smooth": "研磨ペグマタイト", - "block.mineralogy.pegmatite_smooth_stairs": "ペグマタイト研磨階段", - "block.mineralogy.pegmatite_smooth_slab": "ペグマタイト研磨スラブ", - "block.mineralogy.pegmatite_smooth_brick": "ペグマタイト磨きレンガ", - "block.mineralogy.pegmatite_smooth_brick_stairs": "ペグマタイトの磨かれたレンガの階段", - "block.mineralogy.pegmatite_smooth_brick_slab": "ペグマタイト研磨レンガスラブ", + "block.mineralogy.pegmatite_brick_slab": "ペグマタイトレンガのハーフブロック", + "block.mineralogy.pegmatite_smooth": "磨かれたペグマタイト", + "block.mineralogy.pegmatite_smooth_stairs": "磨かれたペグマタイトの階段", + "block.mineralogy.pegmatite_smooth_slab": "磨かれたペグマタイトのハーフブロック", + "block.mineralogy.pegmatite_smooth_brick": "磨かれたペグマタイトレンガ", + "block.mineralogy.pegmatite_smooth_brick_stairs": "磨かれたペグマタイトレンガの階段", + "block.mineralogy.pegmatite_smooth_brick_slab": "磨かれたペグマタイトレンガのハーフブロック", "block.mineralogy.shale": "頁岩", "block.mineralogy.shale_stairs": "頁岩の階段", - "block.mineralogy.shale_slab": "頁岩スラブ", + "block.mineralogy.shale_slab": "頁岩のハーフブロック", "block.mineralogy.shale_brick": "頁岩レンガ", "block.mineralogy.shale_brick_stairs": "頁岩レンガの階段", - "block.mineralogy.shale_brick_slab": "頁岩レンガスラブ", + "block.mineralogy.shale_brick_slab": "頁岩レンガのハーフブロック", "block.mineralogy.shale_smooth": "磨かれた頁岩", - "block.mineralogy.shale_smooth_stairs": "頁岩の磨かれた階段", - "block.mineralogy.shale_smooth_slab": "頁岩研磨スラブ", - "block.mineralogy.shale_smooth_brick": "頁岩磨きレンガ", - "block.mineralogy.shale_smooth_brick_stairs": "頁岩の磨かれたレンガの階段", - "block.mineralogy.shale_smooth_brick_slab": "頁岩研磨レンガスラブ", - "block.mineralogy.conglomerate": "複合企業", - "block.mineralogy.conglomerate_stairs": "コングロマリットの階段", - "block.mineralogy.conglomerate_slab": "複合石のスラブ", - "block.mineralogy.conglomerate_brick": "複合企業のレンガ", - "block.mineralogy.conglomerate_brick_stairs": "複合企業のレンガ階段", - "block.mineralogy.conglomerate_brick_slab": "複合レンガのスラブ", - "block.mineralogy.conglomerate_smooth": "磨かれた複合体", - "block.mineralogy.conglomerate_smooth_stairs": "複合企業の磨かれた階段", - "block.mineralogy.conglomerate_smooth_slab": "複合体研磨スラブ", - "block.mineralogy.conglomerate_smooth_brick": "複合体磨きレンガ", - "block.mineralogy.conglomerate_smooth_brick_stairs": "複合企業の磨かれたレンガの階段", - "block.mineralogy.conglomerate_smooth_brick_slab": "コングロマリットの磨かれたレンガのスラブ", - "block.mineralogy.dolomite": "ドロマイト", - "block.mineralogy.dolomite_stairs": "ドロマイトの階段", - "block.mineralogy.dolomite_slab": "ドロマイトのスラブ", - "block.mineralogy.dolomite_brick": "ドロマイトレンガ", - "block.mineralogy.dolomite_brick_stairs": "ドロマイトレンガの階段", - "block.mineralogy.dolomite_brick_slab": "ドロマイトレンガスラブ", - "block.mineralogy.dolomite_smooth": "ポリッシュドロマイト", - "block.mineralogy.dolomite_smooth_stairs": "ドロマイト研磨階段", - "block.mineralogy.dolomite_smooth_slab": "ドロマイト研磨スラブ", - "block.mineralogy.dolomite_smooth_brick": "ドロマイト磨きレンガ", - "block.mineralogy.dolomite_smooth_brick_stairs": "ドロマイト磨かれたレンガの階段", - "block.mineralogy.dolomite_smooth_brick_slab": "ドロマイト研磨レンガスラブ", + "block.mineralogy.shale_smooth_stairs": "磨かれた頁岩の階段", + "block.mineralogy.shale_smooth_slab": "磨かれた頁岩のハーフブロック", + "block.mineralogy.shale_smooth_brick": "磨かれた頁岩レンガ", + "block.mineralogy.shale_smooth_brick_stairs": "磨かれた頁岩レンガの階段", + "block.mineralogy.shale_smooth_brick_slab": "磨かれた頁岩レンガのハーフブロック", + "block.mineralogy.conglomerate": "礫岩", + "block.mineralogy.conglomerate_stairs": "礫岩の階段", + "block.mineralogy.conglomerate_slab": "礫岩のハーフブロック", + "block.mineralogy.conglomerate_brick": "礫岩レンガ", + "block.mineralogy.conglomerate_brick_stairs": "礫岩レンガの階段", + "block.mineralogy.conglomerate_brick_slab": "礫岩レンガのハーフブロック", + "block.mineralogy.conglomerate_smooth": "磨かれた礫岩", + "block.mineralogy.conglomerate_smooth_stairs": "磨かれた礫岩の階段", + "block.mineralogy.conglomerate_smooth_slab": "磨かれた礫岩のハーフブロック", + "block.mineralogy.conglomerate_smooth_brick": "磨かれた礫岩レンガ", + "block.mineralogy.conglomerate_smooth_brick_stairs": "磨かれた礫岩レンガの階段", + "block.mineralogy.conglomerate_smooth_brick_slab": "磨かれた礫岩レンガのハーフブロック", + "block.mineralogy.dolomite": "苦灰岩", + "block.mineralogy.dolomite_stairs": "苦灰岩の階段", + "block.mineralogy.dolomite_slab": "苦灰岩のハーフブロック", + "block.mineralogy.dolomite_brick": "苦灰岩レンガ", + "block.mineralogy.dolomite_brick_stairs": "苦灰岩レンガの階段", + "block.mineralogy.dolomite_brick_slab": "苦灰岩レンガのハーフブロック", + "block.mineralogy.dolomite_smooth": "磨かれた苦灰岩", + "block.mineralogy.dolomite_smooth_stairs": "磨かれた苦灰岩の階段", + "block.mineralogy.dolomite_smooth_slab": "磨かれた苦灰岩のハーフブロック", + "block.mineralogy.dolomite_smooth_brick": "磨かれた苦灰岩レンガ", + "block.mineralogy.dolomite_smooth_brick_stairs": "磨かれた苦灰岩レンガの階段", + "block.mineralogy.dolomite_smooth_brick_slab": "磨かれた苦灰岩レンガのハーフブロック", "block.mineralogy.limestone": "石灰岩", "block.mineralogy.limestone_stairs": "石灰岩の階段", - "block.mineralogy.limestone_slab": "石灰岩のスラブ", + "block.mineralogy.limestone_slab": "石灰岩のハーフブロック", "block.mineralogy.limestone_brick": "石灰岩レンガ", - "block.mineralogy.limestone_brick_stairs": "石灰岩のレンガの階段", - "block.mineralogy.limestone_brick_slab": "石灰岩レンガ板", + "block.mineralogy.limestone_brick_stairs": "石灰岩レンガの階段", + "block.mineralogy.limestone_brick_slab": "石灰岩レンガのハーフブロック", "block.mineralogy.limestone_smooth": "磨かれた石灰岩", - "block.mineralogy.limestone_smooth_stairs": "石灰岩で磨かれた階段", - "block.mineralogy.limestone_smooth_slab": "石灰岩の磨かれたスラブ", - "block.mineralogy.limestone_smooth_brick": "石灰岩磨きレンガ", - "block.mineralogy.limestone_smooth_brick_stairs": "石灰岩で磨かれたレンガの階段", - "block.mineralogy.limestone_smooth_brick_slab": "石灰岩で磨かれたレンガのスラブ", - "block.mineralogy.slate": "スレート", - "block.mineralogy.slate_stairs": "スレートの階段", - "block.mineralogy.slate_slab": "スレートスラブ", - "block.mineralogy.slate_brick": "スレートレンガ", - "block.mineralogy.slate_brick_stairs": "スレートレンガの階段", - "block.mineralogy.slate_brick_slab": "スレートレンガのスラブ", - "block.mineralogy.slate_smooth": "磨かれたスレート", - "block.mineralogy.slate_smooth_stairs": "スレート磨き階段", - "block.mineralogy.slate_smooth_slab": "スレート研磨スラブ", - "block.mineralogy.slate_smooth_brick": "スレート磨きレンガ", - "block.mineralogy.slate_smooth_brick_stairs": "スレート磨きレンガ階段", - "block.mineralogy.slate_smooth_brick_slab": "スレート研磨レンガスラブ", - "block.mineralogy.schist": "片岩", - "block.mineralogy.schist_stairs": "片岩の階段", - "block.mineralogy.schist_slab": "片岩スラブ", - "block.mineralogy.schist_brick": "片岩レンガ", - "block.mineralogy.schist_brick_stairs": "片岩レンガ階段", - "block.mineralogy.schist_brick_slab": "片岩レンガスラブ", - "block.mineralogy.schist_smooth": "研磨片岩", - "block.mineralogy.schist_smooth_stairs": "片岩研磨階段", - "block.mineralogy.schist_smooth_slab": "片岩研磨スラブ", - "block.mineralogy.schist_smooth_brick": "片岩磨きレンガ", - "block.mineralogy.schist_smooth_brick_stairs": "片岩磨きレンガ階段", - "block.mineralogy.schist_smooth_brick_slab": "片岩研磨レンガスラブ", + "block.mineralogy.limestone_smooth_stairs": "磨かれた石灰岩の階段", + "block.mineralogy.limestone_smooth_slab": "磨かれた石灰岩のハーフブロック", + "block.mineralogy.limestone_smooth_brick": "磨かれた石灰岩レンガ", + "block.mineralogy.limestone_smooth_brick_stairs": "磨かれた石灰岩レンガの階段", + "block.mineralogy.limestone_smooth_brick_slab": "磨かれた石灰岩レンガのハーフブロック", + "block.mineralogy.slate": "粘板岩", + "block.mineralogy.slate_stairs": "粘板岩の階段", + "block.mineralogy.slate_slab": "粘板岩のハーフブロック", + "block.mineralogy.slate_brick": "粘板岩レンガ", + "block.mineralogy.slate_brick_stairs": "粘板岩レンガの階段", + "block.mineralogy.slate_brick_slab": "粘板岩レンガのハーフブロック", + "block.mineralogy.slate_smooth": "磨かれた粘板岩", + "block.mineralogy.slate_smooth_stairs": "磨かれた粘板岩の階段", + "block.mineralogy.slate_smooth_slab": "磨かれた粘板岩のハーフブロック", + "block.mineralogy.slate_smooth_brick": "磨かれた粘板岩レンガ", + "block.mineralogy.slate_smooth_brick_stairs": "磨かれた粘板岩レンガの階段", + "block.mineralogy.slate_smooth_brick_slab": "磨かれた粘板岩レンガのハーフブロック", + "block.mineralogy.schist": "結晶片岩", + "block.mineralogy.schist_stairs": "結晶片岩の階段", + "block.mineralogy.schist_slab": "結晶片岩のハーフブロック", + "block.mineralogy.schist_brick": "結晶片岩レンガ", + "block.mineralogy.schist_brick_stairs": "結晶片岩レンガの階段", + "block.mineralogy.schist_brick_slab": "結晶片岩レンガのハーフブロック", + "block.mineralogy.schist_smooth": "磨かれた結晶片岩", + "block.mineralogy.schist_smooth_stairs": "磨かれた結晶片岩の階段", + "block.mineralogy.schist_smooth_slab": "磨かれた結晶片岩のハーフブロック", + "block.mineralogy.schist_smooth_brick": "磨かれた結晶片岩レンガ", + "block.mineralogy.schist_smooth_brick_stairs": "磨かれた結晶片岩レンガの階段", + "block.mineralogy.schist_smooth_brick_slab": "磨かれた結晶片岩レンガのハーフブロック", "block.mineralogy.gneiss": "片麻岩", "block.mineralogy.gneiss_stairs": "片麻岩の階段", - "block.mineralogy.gneiss_slab": "片麻岩スラブ", + "block.mineralogy.gneiss_slab": "片麻岩のハーフブロック", "block.mineralogy.gneiss_brick": "片麻岩レンガ", - "block.mineralogy.gneiss_brick_stairs": "片麻岩のレンガの階段", - "block.mineralogy.gneiss_brick_slab": "片麻岩レンガ板", + "block.mineralogy.gneiss_brick_stairs": "片麻岩レンガの階段", + "block.mineralogy.gneiss_brick_slab": "片麻岩レンガのハーフブロック", "block.mineralogy.gneiss_smooth": "磨かれた片麻岩", - "block.mineralogy.gneiss_smooth_stairs": "片麻岩の磨かれた階段", - "block.mineralogy.gneiss_smooth_slab": "片麻岩研磨スラブ", - "block.mineralogy.gneiss_smooth_brick": "片麻岩研磨レンガ", - "block.mineralogy.gneiss_smooth_brick_stairs": "片麻岩の磨かれたレンガの階段", - "block.mineralogy.gneiss_smooth_brick_slab": "片麻岩研磨レンガスラブ", + "block.mineralogy.gneiss_smooth_stairs": "磨かれた片麻岩の階段", + "block.mineralogy.gneiss_smooth_slab": "磨かれた片麻岩のハーフブロック", + "block.mineralogy.gneiss_smooth_brick": "磨かれた片麻岩レンガ", + "block.mineralogy.gneiss_smooth_brick_stairs": "磨かれた片麻岩レンガの階段", + "block.mineralogy.gneiss_smooth_brick_slab": "磨かれた片麻岩レンガのハーフブロック", "block.mineralogy.marble": "大理石", "block.mineralogy.marble_stairs": "大理石の階段", - "block.mineralogy.marble_slab": "大理石のスラブ", + "block.mineralogy.marble_slab": "大理石のハーフブロック", "block.mineralogy.marble_brick": "大理石レンガ", - "block.mineralogy.marble_brick_stairs": "大理石のレンガの階段", - "block.mineralogy.marble_brick_slab": "大理石のレンガのスラブ", + "block.mineralogy.marble_brick_stairs": "大理石レンガの階段", + "block.mineralogy.marble_brick_slab": "大理石レンガのハーフブロック", "block.mineralogy.marble_smooth": "磨かれた大理石", - "block.mineralogy.marble_smooth_stairs": "大理石の磨かれた階段", - "block.mineralogy.marble_smooth_slab": "大理石の磨かれたスラブ", - "block.mineralogy.marble_smooth_brick": "大理石磨きレンガ", - "block.mineralogy.marble_smooth_brick_stairs": "大理石の磨かれたレンガの階段", - "block.mineralogy.marble_smooth_brick_slab": "大理石の磨かれたレンガのスラブ", + "block.mineralogy.marble_smooth_stairs": "磨かれた大理石の階段", + "block.mineralogy.marble_smooth_slab": "磨かれた大理石のハーフブロック", + "block.mineralogy.marble_smooth_brick": "磨かれた大理石レンガ", + "block.mineralogy.marble_smooth_brick_stairs": "磨かれた大理石レンガの階段", + "block.mineralogy.marble_smooth_brick_slab": "磨かれた大理石レンガのハーフブロック", "block.mineralogy.phyllite": "千枚岩", "block.mineralogy.phyllite_stairs": "千枚岩の階段", - "block.mineralogy.phyllite_slab": "千枚岩の平板", + "block.mineralogy.phyllite_slab": "千枚岩のハーフブロック", "block.mineralogy.phyllite_brick": "千枚岩レンガ", "block.mineralogy.phyllite_brick_stairs": "千枚岩レンガの階段", - "block.mineralogy.phyllite_brick_slab": "千枚岩レンガ板", - "block.mineralogy.phyllite_smooth": "研磨千枚岩", - "block.mineralogy.phyllite_smooth_stairs": "千枚岩研磨階段", - "block.mineralogy.phyllite_smooth_slab": "千枚岩研磨スラブ", - "block.mineralogy.phyllite_smooth_brick": "千枚岩磨きレンガ", - "block.mineralogy.phyllite_smooth_brick_stairs": "千枚岩の磨かれたレンガの階段", - "block.mineralogy.phyllite_smooth_brick_slab": "千枚岩研磨レンガスラブ", - "block.mineralogy.amphibolite": "角閃石", + "block.mineralogy.phyllite_brick_slab": "千枚岩レンガのハーフブロック", + "block.mineralogy.phyllite_smooth": "磨かれた千枚岩", + "block.mineralogy.phyllite_smooth_stairs": "磨かれた千枚岩の階段", + "block.mineralogy.phyllite_smooth_slab": "磨かれた千枚岩のハーフブロック", + "block.mineralogy.phyllite_smooth_brick": "磨かれた千枚岩レンガ", + "block.mineralogy.phyllite_smooth_brick_stairs": "磨かれた千枚岩レンガの階段", + "block.mineralogy.phyllite_smooth_brick_slab": "磨かれた千枚岩レンガのハーフブロック", + "block.mineralogy.amphibolite": "角閃岩", "block.mineralogy.amphibolite_stairs": "角閃岩の階段", - "block.mineralogy.amphibolite_slab": "角閃岩スラブ", - "block.mineralogy.amphibolite_brick": "角閃石レンガ", - "block.mineralogy.amphibolite_brick_stairs": "角閃岩のレンガの階段", - "block.mineralogy.amphibolite_brick_slab": "角閃岩レンガ板", - "block.mineralogy.amphibolite_smooth": "滑らかな角閃石", - "block.mineralogy.amphibolite_smooth_stairs": "角閃岩の磨かれた階段", - "block.mineralogy.amphibolite_smooth_slab": "角閃石研磨スラブ", - "block.mineralogy.amphibolite_smooth_brick": "角閃石磨きレンガ", - "block.mineralogy.amphibolite_smooth_brick_stairs": "角閃岩の磨かれたレンガの階段", - "block.mineralogy.amphibolite_smooth_brick_slab": "角閃岩の磨かれたレンガのスラブ", + "block.mineralogy.amphibolite_slab": "角閃岩のハーフブロック", + "block.mineralogy.amphibolite_brick": "角閃岩レンガ", + "block.mineralogy.amphibolite_brick_stairs": "角閃岩レンガの階段", + "block.mineralogy.amphibolite_brick_slab": "角閃岩レンガのハーフブロック", + "block.mineralogy.amphibolite_smooth": "磨かれた角閃岩", + "block.mineralogy.amphibolite_smooth_stairs": "磨かれた角閃岩の階段", + "block.mineralogy.amphibolite_smooth_slab": "磨かれた角閃岩のハーフブロック", + "block.mineralogy.amphibolite_smooth_brick": "磨かれた角閃岩レンガ", + "block.mineralogy.amphibolite_smooth_brick_stairs": "磨かれた角閃岩レンガの階段", + "block.mineralogy.amphibolite_smooth_brick_slab": "磨かれた角閃岩レンガのハーフブロック", "item.mineralogy.gypsum_dust": "石膏粉末", "item.mineralogy.sulfur_dust": "硫黄粉末", "item.mineralogy.phosphorous_dust": "リン粉末", "item.mineralogy.nitrate_dust": "硝酸塩粉末", - "item.mineralogy.mineral_fertilizer": "ミネラル肥料", + "item.mineralogy.mineral_fertilizer": "鉱物肥料", "block.mineralogy.chert": "チャート", "block.mineralogy.gypsum": "石膏", "block.mineralogy.pumice": "軽石", @@ -205,736 +205,736 @@ "block.mineralogy.phosphorous_ore": "リン鉱石", "block.mineralogy.nitrate_block": "硝酸塩", "block.mineralogy.nitrate_ore": "硝酸塩鉱石", - "block.mineralogy.drywall_black": "ブラック乾式壁", - "block.mineralogy.drywall_red": "赤い乾式壁", - "block.mineralogy.drywall_green": "グリーン乾式壁", - "block.mineralogy.drywall_brown": "茶色の乾式壁", - "block.mineralogy.drywall_blue": "ブルー乾式壁", - "block.mineralogy.drywall_purple": "パープル乾式壁", - "block.mineralogy.drywall_cyan": "シアン乾式壁", - "block.mineralogy.drywall_silver": "ライトグレーの乾式壁", - "block.mineralogy.drywall_gray": "灰色の乾式壁", - "block.mineralogy.drywall_pink": "ピンクの乾式壁", - "block.mineralogy.drywall_lime": "ライムグリーンの乾式壁", - "block.mineralogy.drywall_yellow": "黄色の乾式壁", - "block.mineralogy.drywall_light_blue": "ライトブルーの乾式壁", - "block.mineralogy.drywall_magenta": "マゼンタの乾式壁", - "block.mineralogy.drywall_orange": "オレンジの乾式壁", - "block.mineralogy.drywall_white": "白い乾式壁", - "block.mineralogy.andesite_wall": "安山岩の壁", - "block.mineralogy.andesite_brick_wall": "安山岩のレンガの壁", - "block.mineralogy.andesite_smooth_wall": "安山岩の磨かれた壁", - "block.mineralogy.andesite_smooth_brick_wall": "安山岩の磨かれたレンガの壁", - "block.mineralogy.basalt_wall": "玄武岩の壁", - "block.mineralogy.basalt_brick_wall": "玄武岩のレンガの壁", - "block.mineralogy.basalt_smooth_wall": "玄武岩の磨かれた壁", - "block.mineralogy.basalt_smooth_brick_wall": "玄武岩の磨かれたレンガの壁", - "block.mineralogy.diorite_wall": "閃緑岩の壁", - "block.mineralogy.diorite_brick_wall": "閃緑岩のレンガの壁", - "block.mineralogy.diorite_smooth_wall": "閃緑岩の磨かれた壁", - "block.mineralogy.diorite_smooth_brick_wall": "閃緑岩の磨かれたレンガ壁", - "block.mineralogy.granite_wall": "花崗岩の壁", - "block.mineralogy.granite_brick_wall": "花崗岩のレンガの壁", - "block.mineralogy.granite_smooth_wall": "花崗岩の磨かれた壁", - "block.mineralogy.granite_smooth_brick_wall": "花崗岩の磨かれたレンガの壁", - "block.mineralogy.rhyolite_wall": "流紋岩の壁", - "block.mineralogy.rhyolite_brick_wall": "流紋岩のレンガの壁", - "block.mineralogy.rhyolite_smooth_wall": "流紋岩の磨かれた壁", - "block.mineralogy.rhyolite_smooth_brick_wall": "流紋岩で磨かれたレンガの壁", - "block.mineralogy.pegmatite_wall": "ペグマタイトの壁", - "block.mineralogy.pegmatite_brick_wall": "ペグマタイト レンガ壁", - "block.mineralogy.pegmatite_smooth_wall": "ペグマタイト研磨壁", - "block.mineralogy.pegmatite_smooth_brick_wall": "ペグマタイトの磨かれたレンガ壁", - "block.mineralogy.shale_wall": "頁岩の壁", - "block.mineralogy.shale_brick_wall": "頁岩レンガの壁", - "block.mineralogy.shale_smooth_wall": "頁岩の磨かれた壁", - "block.mineralogy.shale_smooth_brick_wall": "頁岩の磨かれたレンガの壁", - "block.mineralogy.conglomerate_wall": "複合企業の壁", - "block.mineralogy.conglomerate_brick_wall": "複合企業体のレンガの壁", - "block.mineralogy.conglomerate_smooth_wall": "複合体の磨かれた壁", - "block.mineralogy.conglomerate_smooth_brick_wall": "複合企業の磨かれたレンガの壁", - "block.mineralogy.dolomite_wall": "ドロマイトの壁", - "block.mineralogy.dolomite_brick_wall": "ドロマイトのレンガの壁", - "block.mineralogy.dolomite_smooth_wall": "ドロマイト研磨壁", - "block.mineralogy.dolomite_smooth_brick_wall": "ドロマイトの磨かれたレンガの壁", - "block.mineralogy.limestone_wall": "石灰岩の壁", - "block.mineralogy.limestone_brick_wall": "石灰岩のレンガの壁", - "block.mineralogy.limestone_smooth_wall": "石灰岩で磨かれた壁", - "block.mineralogy.limestone_smooth_brick_wall": "石灰岩で磨かれたレンガの壁", - "block.mineralogy.marble_wall": "大理石の壁", - "block.mineralogy.marble_brick_wall": "大理石のレンガの壁", - "block.mineralogy.marble_smooth_wall": "大理石の磨かれた壁", - "block.mineralogy.marble_smooth_brick_wall": "大理石の磨かれたレンガの壁", - "block.mineralogy.slate_wall": "スレート壁", - "block.mineralogy.slate_brick_wall": "スレートレンガの壁", - "block.mineralogy.slate_smooth_wall": "スレート磨き壁", - "block.mineralogy.slate_smooth_brick_wall": "スレート磨きレンガ壁", - "block.mineralogy.schist_wall": "片岩壁", - "block.mineralogy.schist_brick_wall": "片岩レンガ壁", - "block.mineralogy.schist_smooth_wall": "片岩研磨壁", - "block.mineralogy.schist_smooth_brick_wall": "片岩磨きレンガ壁", - "block.mineralogy.gneiss_wall": "片麻岩の壁", - "block.mineralogy.gneiss_brick_wall": "片麻岩レンガ壁", - "block.mineralogy.gneiss_smooth_wall": "片麻岩の磨かれた壁", - "block.mineralogy.gneiss_smooth_brick_wall": "片麻岩の磨かれたレンガの壁", - "block.mineralogy.phyllite_wall": "千枚岩壁", - "block.mineralogy.phyllite_brick_wall": "千枚岩レンガ壁", - "block.mineralogy.phyllite_smooth_wall": "千枚岩研磨壁", - "block.mineralogy.phyllite_smooth_brick_wall": "千枚岩の磨かれたレンガの壁", - "block.mineralogy.amphibolite_wall": "角閃岩の壁", - "block.mineralogy.amphibolite_brick_wall": "角閃岩のレンガの壁", - "block.mineralogy.amphibolite_smooth_wall": "角閃石の磨かれた壁", - "block.mineralogy.amphibolite_smooth_brick_wall": "角閃石の磨かれたレンガ壁", - "block.mineralogy.andesite_furnace": "安山岩炉", - "block.mineralogy.andesite_brick_furnace": "安山岩のレンガ炉", - "block.mineralogy.andesite_smooth_furnace": "安山岩研磨炉", - "block.mineralogy.andesite_smooth_brick_furnace": "安山岩磨かれたレンガ炉", - "block.mineralogy.basalt_furnace": "玄武岩炉", - "block.mineralogy.basalt_brick_furnace": "玄武岩レンガ炉", - "block.mineralogy.basalt_smooth_furnace": "玄武岩研磨炉", - "block.mineralogy.basalt_smooth_brick_furnace": "玄武岩磨きレンガ炉", - "block.mineralogy.diorite_furnace": "閃緑岩炉", - "block.mineralogy.diorite_brick_furnace": "閃緑岩レンガ炉", - "block.mineralogy.diorite_smooth_furnace": "閃緑岩の研磨炉", - "block.mineralogy.diorite_smooth_brick_furnace": "閃緑岩の磨かれたレンガ炉", - "block.mineralogy.granite_furnace": "花崗岩炉", - "block.mineralogy.granite_brick_furnace": "花崗岩のレンガ炉", - "block.mineralogy.granite_smooth_furnace": "花崗岩の研磨炉", - "block.mineralogy.granite_smooth_brick_furnace": "花崗岩の磨かれたレンガ炉", - "block.mineralogy.rhyolite_furnace": "流紋岩炉", - "block.mineralogy.rhyolite_brick_furnace": "流紋岩煉瓦炉", - "block.mineralogy.rhyolite_smooth_furnace": "流紋岩研磨炉", - "block.mineralogy.rhyolite_smooth_brick_furnace": "流紋岩磨きレンガ炉", - "block.mineralogy.pegmatite_furnace": "ペグマタイト炉", - "block.mineralogy.pegmatite_brick_furnace": "ペグマタイト煉瓦炉", - "block.mineralogy.pegmatite_smooth_furnace": "ペグマタイト研磨炉", - "block.mineralogy.pegmatite_smooth_brick_furnace": "ペグマタイト磨きレンガ炉", - "block.mineralogy.shale_furnace": "シェール炉", - "block.mineralogy.shale_brick_furnace": "頁岩レンガ炉", - "block.mineralogy.shale_smooth_furnace": "頁岩研磨炉", - "block.mineralogy.shale_smooth_brick_furnace": "頁岩の磨かれたレンガ炉", - "block.mineralogy.conglomerate_furnace": "複合炉", - "block.mineralogy.conglomerate_brick_furnace": "複合企業のレンガ炉", - "block.mineralogy.conglomerate_smooth_furnace": "複合体研磨炉", - "block.mineralogy.conglomerate_smooth_brick_furnace": "複合企業の磨かれたレンガ炉", - "block.mineralogy.dolomite_furnace": "ドロマイト炉", - "block.mineralogy.dolomite_brick_furnace": "ドロマイトレンガ炉", - "block.mineralogy.dolomite_smooth_furnace": "ドロマイト研磨炉", - "block.mineralogy.dolomite_smooth_brick_furnace": "ドロマイト磨かれたレンガ炉", - "block.mineralogy.limestone_furnace": "石灰石炉", - "block.mineralogy.limestone_brick_furnace": "石灰石レンガ炉", - "block.mineralogy.limestone_smooth_furnace": "石灰石研磨炉", - "block.mineralogy.limestone_smooth_brick_furnace": "石灰石磨きレンガ炉", - "block.mineralogy.marble_furnace": "大理石炉", - "block.mineralogy.marble_brick_furnace": "大理石レンガ炉", - "block.mineralogy.marble_smooth_furnace": "大理石磨き炉", - "block.mineralogy.marble_smooth_brick_furnace": "大理石磨きレンガ炉", - "block.mineralogy.slate_furnace": "スレート炉", - "block.mineralogy.slate_brick_furnace": "スレートレンガ炉", - "block.mineralogy.slate_smooth_furnace": "スレート研磨炉", - "block.mineralogy.slate_smooth_brick_furnace": "スレート磨きレンガ炉", - "block.mineralogy.schist_furnace": "片岩炉", - "block.mineralogy.schist_brick_furnace": "片岩煉瓦炉", - "block.mineralogy.schist_smooth_furnace": "片岩研磨炉", - "block.mineralogy.schist_smooth_brick_furnace": "片岩磨き煉瓦炉", - "block.mineralogy.gneiss_furnace": "片麻岩炉", - "block.mineralogy.gneiss_brick_furnace": "片麻岩レンガ炉", - "block.mineralogy.gneiss_smooth_furnace": "片麻岩研磨炉", - "block.mineralogy.gneiss_smooth_brick_furnace": "片麻岩の磨かれたレンガ炉", - "block.mineralogy.phyllite_furnace": "千枚岩炉", - "block.mineralogy.phyllite_brick_furnace": "千枚石レンガ炉", - "block.mineralogy.phyllite_smooth_furnace": "千枚岩研磨炉", - "block.mineralogy.phyllite_smooth_brick_furnace": "千枚岩磨きレンガ炉", - "block.mineralogy.amphibolite_furnace": "角閃岩炉", - "block.mineralogy.amphibolite_brick_furnace": "角閃岩レンガ炉", - "block.mineralogy.amphibolite_smooth_furnace": "角閃石研磨炉", - "block.mineralogy.amphibolite_smooth_brick_furnace": "角閃岩の磨かれたレンガ炉", + "block.mineralogy.drywall_black": "黒色の石膏ボード", + "block.mineralogy.drywall_red": "赤色の石膏ボード", + "block.mineralogy.drywall_green": "緑色の石膏ボード", + "block.mineralogy.drywall_brown": "茶色の石膏ボード", + "block.mineralogy.drywall_blue": "青色の石膏ボード", + "block.mineralogy.drywall_purple": "紫色の石膏ボード", + "block.mineralogy.drywall_cyan": "青緑色の石膏ボード", + "block.mineralogy.drywall_silver": "薄灰色の石膏ボード", + "block.mineralogy.drywall_gray": "灰色の石膏ボード", + "block.mineralogy.drywall_pink": "桃色の石膏ボード", + "block.mineralogy.drywall_lime": "黄緑色の石膏ボード", + "block.mineralogy.drywall_yellow": "黄色の石膏ボード", + "block.mineralogy.drywall_light_blue": "空色の石膏ボード", + "block.mineralogy.drywall_magenta": "赤紫色の石膏ボード", + "block.mineralogy.drywall_orange": "橙色の石膏ボード", + "block.mineralogy.drywall_white": "白色の石膏ボード", + "block.mineralogy.andesite_wall": "安山岩の塀", + "block.mineralogy.andesite_brick_wall": "安山岩レンガの塀", + "block.mineralogy.andesite_smooth_wall": "磨かれた安山岩の塀", + "block.mineralogy.andesite_smooth_brick_wall": "磨かれた安山岩レンガの塀", + "block.mineralogy.basalt_wall": "玄武岩の塀", + "block.mineralogy.basalt_brick_wall": "玄武岩レンガの塀", + "block.mineralogy.basalt_smooth_wall": "磨かれた玄武岩の塀", + "block.mineralogy.basalt_smooth_brick_wall": "磨かれた玄武岩レンガの塀", + "block.mineralogy.diorite_wall": "閃緑岩の塀", + "block.mineralogy.diorite_brick_wall": "閃緑岩レンガの塀", + "block.mineralogy.diorite_smooth_wall": "磨かれた閃緑岩の塀", + "block.mineralogy.diorite_smooth_brick_wall": "磨かれた閃緑岩レンガの塀", + "block.mineralogy.granite_wall": "花崗岩の塀", + "block.mineralogy.granite_brick_wall": "花崗岩レンガの塀", + "block.mineralogy.granite_smooth_wall": "磨かれた花崗岩の塀", + "block.mineralogy.granite_smooth_brick_wall": "磨かれた花崗岩レンガの塀", + "block.mineralogy.rhyolite_wall": "流紋岩の塀", + "block.mineralogy.rhyolite_brick_wall": "流紋岩レンガの塀", + "block.mineralogy.rhyolite_smooth_wall": "磨かれた流紋岩の塀", + "block.mineralogy.rhyolite_smooth_brick_wall": "磨かれた流紋岩レンガの塀", + "block.mineralogy.pegmatite_wall": "ペグマタイトの塀", + "block.mineralogy.pegmatite_brick_wall": "ペグマタイトレンガの塀", + "block.mineralogy.pegmatite_smooth_wall": "磨かれたペグマタイトの塀", + "block.mineralogy.pegmatite_smooth_brick_wall": "磨かれたペグマタイトレンガの塀", + "block.mineralogy.shale_wall": "頁岩の塀", + "block.mineralogy.shale_brick_wall": "頁岩レンガの塀", + "block.mineralogy.shale_smooth_wall": "磨かれた頁岩の塀", + "block.mineralogy.shale_smooth_brick_wall": "磨かれた頁岩レンガの塀", + "block.mineralogy.conglomerate_wall": "礫岩の塀", + "block.mineralogy.conglomerate_brick_wall": "礫岩レンガの塀", + "block.mineralogy.conglomerate_smooth_wall": "磨かれた礫岩の塀", + "block.mineralogy.conglomerate_smooth_brick_wall": "磨かれた礫岩レンガの塀", + "block.mineralogy.dolomite_wall": "苦灰岩の塀", + "block.mineralogy.dolomite_brick_wall": "苦灰岩レンガの塀", + "block.mineralogy.dolomite_smooth_wall": "磨かれた苦灰岩の塀", + "block.mineralogy.dolomite_smooth_brick_wall": "磨かれた苦灰岩レンガの塀", + "block.mineralogy.limestone_wall": "石灰岩の塀", + "block.mineralogy.limestone_brick_wall": "石灰岩レンガの塀", + "block.mineralogy.limestone_smooth_wall": "磨かれた石灰岩の塀", + "block.mineralogy.limestone_smooth_brick_wall": "磨かれた石灰岩レンガの塀", + "block.mineralogy.marble_wall": "大理石の塀", + "block.mineralogy.marble_brick_wall": "大理石レンガの塀", + "block.mineralogy.marble_smooth_wall": "磨かれた大理石の塀", + "block.mineralogy.marble_smooth_brick_wall": "磨かれた大理石レンガの塀", + "block.mineralogy.slate_wall": "粘板岩の塀", + "block.mineralogy.slate_brick_wall": "粘板岩レンガの塀", + "block.mineralogy.slate_smooth_wall": "磨かれた粘板岩の塀", + "block.mineralogy.slate_smooth_brick_wall": "磨かれた粘板岩レンガの塀", + "block.mineralogy.schist_wall": "結晶片岩の塀", + "block.mineralogy.schist_brick_wall": "結晶片岩レンガの塀", + "block.mineralogy.schist_smooth_wall": "磨かれた結晶片岩の塀", + "block.mineralogy.schist_smooth_brick_wall": "磨かれた結晶片岩レンガの塀", + "block.mineralogy.gneiss_wall": "片麻岩の塀", + "block.mineralogy.gneiss_brick_wall": "片麻岩レンガの塀", + "block.mineralogy.gneiss_smooth_wall": "磨かれた片麻岩の塀", + "block.mineralogy.gneiss_smooth_brick_wall": "磨かれた片麻岩レンガの塀", + "block.mineralogy.phyllite_wall": "千枚岩の塀", + "block.mineralogy.phyllite_brick_wall": "千枚岩レンガの塀", + "block.mineralogy.phyllite_smooth_wall": "磨かれた千枚岩の塀", + "block.mineralogy.phyllite_smooth_brick_wall": "磨かれた千枚岩レンガの塀", + "block.mineralogy.amphibolite_wall": "角閃岩の塀", + "block.mineralogy.amphibolite_brick_wall": "角閃岩レンガの塀", + "block.mineralogy.amphibolite_smooth_wall": "磨かれた角閃岩の塀", + "block.mineralogy.amphibolite_smooth_brick_wall": "磨かれた角閃岩レンガの塀", + "block.mineralogy.andesite_furnace": "安山岩のかまど", + "block.mineralogy.andesite_brick_furnace": "安山岩レンガのかまど", + "block.mineralogy.andesite_smooth_furnace": "磨かれた安山岩のかまど", + "block.mineralogy.andesite_smooth_brick_furnace": "磨かれた安山岩レンガのかまど", + "block.mineralogy.basalt_furnace": "玄武岩のかまど", + "block.mineralogy.basalt_brick_furnace": "玄武岩レンガのかまど", + "block.mineralogy.basalt_smooth_furnace": "磨かれた玄武岩のかまど", + "block.mineralogy.basalt_smooth_brick_furnace": "磨かれた玄武岩レンガのかまど", + "block.mineralogy.diorite_furnace": "閃緑岩のかまど", + "block.mineralogy.diorite_brick_furnace": "閃緑岩レンガのかまど", + "block.mineralogy.diorite_smooth_furnace": "磨かれた閃緑岩のかまど", + "block.mineralogy.diorite_smooth_brick_furnace": "磨かれた閃緑岩レンガのかまど", + "block.mineralogy.granite_furnace": "花崗岩のかまど", + "block.mineralogy.granite_brick_furnace": "花崗岩レンガのかまど", + "block.mineralogy.granite_smooth_furnace": "磨かれた花崗岩のかまど", + "block.mineralogy.granite_smooth_brick_furnace": "磨かれた花崗岩レンガのかまど", + "block.mineralogy.rhyolite_furnace": "流紋岩のかまど", + "block.mineralogy.rhyolite_brick_furnace": "流紋岩レンガのかまど", + "block.mineralogy.rhyolite_smooth_furnace": "磨かれた流紋岩のかまど", + "block.mineralogy.rhyolite_smooth_brick_furnace": "磨かれた流紋岩レンガのかまど", + "block.mineralogy.pegmatite_furnace": "ペグマタイトのかまど", + "block.mineralogy.pegmatite_brick_furnace": "ペグマタイトレンガのかまど", + "block.mineralogy.pegmatite_smooth_furnace": "磨かれたペグマタイトのかまど", + "block.mineralogy.pegmatite_smooth_brick_furnace": "磨かれたペグマタイトレンガのかまど", + "block.mineralogy.shale_furnace": "頁岩のかまど", + "block.mineralogy.shale_brick_furnace": "頁岩レンガのかまど", + "block.mineralogy.shale_smooth_furnace": "磨かれた頁岩のかまど", + "block.mineralogy.shale_smooth_brick_furnace": "磨かれた頁岩レンガのかまど", + "block.mineralogy.conglomerate_furnace": "礫岩のかまど", + "block.mineralogy.conglomerate_brick_furnace": "礫岩レンガのかまど", + "block.mineralogy.conglomerate_smooth_furnace": "磨かれた礫岩のかまど", + "block.mineralogy.conglomerate_smooth_brick_furnace": "磨かれた礫岩レンガのかまど", + "block.mineralogy.dolomite_furnace": "苦灰岩のかまど", + "block.mineralogy.dolomite_brick_furnace": "苦灰岩レンガのかまど", + "block.mineralogy.dolomite_smooth_furnace": "磨かれた苦灰岩のかまど", + "block.mineralogy.dolomite_smooth_brick_furnace": "磨かれた苦灰岩レンガのかまど", + "block.mineralogy.limestone_furnace": "石灰岩のかまど", + "block.mineralogy.limestone_brick_furnace": "石灰岩レンガのかまど", + "block.mineralogy.limestone_smooth_furnace": "磨かれた石灰岩のかまど", + "block.mineralogy.limestone_smooth_brick_furnace": "磨かれた石灰岩レンガのかまど", + "block.mineralogy.marble_furnace": "大理石のかまど", + "block.mineralogy.marble_brick_furnace": "大理石レンガのかまど", + "block.mineralogy.marble_smooth_furnace": "磨かれた大理石のかまど", + "block.mineralogy.marble_smooth_brick_furnace": "磨かれた大理石レンガのかまど", + "block.mineralogy.slate_furnace": "粘板岩のかまど", + "block.mineralogy.slate_brick_furnace": "粘板岩レンガのかまど", + "block.mineralogy.slate_smooth_furnace": "磨かれた粘板岩のかまど", + "block.mineralogy.slate_smooth_brick_furnace": "磨かれた粘板岩レンガのかまど", + "block.mineralogy.schist_furnace": "結晶片岩のかまど", + "block.mineralogy.schist_brick_furnace": "結晶片岩レンガのかまど", + "block.mineralogy.schist_smooth_furnace": "磨かれた結晶片岩のかまど", + "block.mineralogy.schist_smooth_brick_furnace": "磨かれた結晶片岩レンガのかまど", + "block.mineralogy.gneiss_furnace": "片麻岩のかまど", + "block.mineralogy.gneiss_brick_furnace": "片麻岩レンガのかまど", + "block.mineralogy.gneiss_smooth_furnace": "磨かれた片麻岩のかまど", + "block.mineralogy.gneiss_smooth_brick_furnace": "磨かれた片麻岩レンガのかまど", + "block.mineralogy.phyllite_furnace": "千枚岩のかまど", + "block.mineralogy.phyllite_brick_furnace": "千枚岩レンガのかまど", + "block.mineralogy.phyllite_smooth_furnace": "磨かれた千枚岩のかまど", + "block.mineralogy.phyllite_smooth_brick_furnace": "磨かれた千枚岩レンガのかまど", + "block.mineralogy.amphibolite_furnace": "角閃岩のかまど", + "block.mineralogy.amphibolite_brick_furnace": "角閃岩レンガのかまど", + "block.mineralogy.amphibolite_smooth_furnace": "磨かれた角閃岩のかまど", + "block.mineralogy.amphibolite_smooth_brick_furnace": "磨かれた角閃岩レンガのかまど", "block.mineralogy.diabase": "輝緑岩", "block.mineralogy.diabase_stairs": "輝緑岩の階段", - "block.mineralogy.diabase_slab": "輝緑岩スラブ", - "block.mineralogy.diabase_brick": "輝緑煉瓦", - "block.mineralogy.diabase_brick_stairs": "輝緑レンガの階段", - "block.mineralogy.diabase_brick_slab": "輝緑岩レンガハーフブロック", - "block.mineralogy.diabase_smooth": "ポリッシュ輝緑岩", - "block.mineralogy.diabase_smooth_stairs": "輝緑岩磨き階段", - "block.mineralogy.diabase_smooth_slab": "輝緑岩研磨スラブ", - "block.mineralogy.diabase_smooth_brick": "輝緑岩磨きレンガ", - "block.mineralogy.diabase_smooth_brick_stairs": "輝緑岩の磨かれたレンガの階段", - "block.mineralogy.diabase_smooth_brick_slab": "輝緑岩磨きレンガスラブ", - "block.mineralogy.diabase_wall": "輝緑岩壁", - "block.mineralogy.diabase_brick_wall": "輝緑岩レンガ壁", - "block.mineralogy.diabase_smooth_wall": "輝緑岩磨き壁", - "block.mineralogy.diabase_smooth_brick_wall": "輝緑岩の磨かれたレンガ壁", - "block.mineralogy.diabase_furnace": "輝緑岩炉", - "block.mineralogy.diabase_brick_furnace": "輝緑岩煉瓦炉", - "block.mineralogy.diabase_smooth_furnace": "輝緑岩研磨炉", - "block.mineralogy.diabase_smooth_brick_furnace": "輝緑岩磨きレンガ炉", - "block.mineralogy.gabbro": "斑れい岩", - "block.mineralogy.gabbro_stairs": "斑れい岩の階段", - "block.mineralogy.gabbro_slab": "斑れい岩スラブ", - "block.mineralogy.gabbro_brick": "斑れい岩レンガ", - "block.mineralogy.gabbro_brick_stairs": "斑れいレンガの階段", - "block.mineralogy.gabbro_brick_slab": "斑れいレンガのスラブ", - "block.mineralogy.gabbro_smooth": "磨かれた斑れい岩", - "block.mineralogy.gabbro_smooth_stairs": "斑れい岩の磨かれた階段", - "block.mineralogy.gabbro_smooth_slab": "斑れい岩研磨スラブ", - "block.mineralogy.gabbro_smooth_brick": "斑れい岩磨きレンガ", - "block.mineralogy.gabbro_smooth_brick_stairs": "斑れい岩の磨かれたレンガの階段", - "block.mineralogy.gabbro_smooth_brick_slab": "斑れい岩研磨レンガスラブ", - "block.mineralogy.gabbro_wall": "斑れい岩の壁", - "block.mineralogy.gabbro_brick_wall": "斑れいレンガ壁", - "block.mineralogy.gabbro_smooth_wall": "斑れい岩の磨かれた壁", - "block.mineralogy.gabbro_smooth_brick_wall": "斑れい岩の磨かれたレンガ壁", - "block.mineralogy.gabbro_furnace": "斑れい岩炉", - "block.mineralogy.gabbro_brick_furnace": "斑れい岩レンガ炉", - "block.mineralogy.gabbro_smooth_furnace": "斑れい岩研磨炉", - "block.mineralogy.gabbro_smooth_brick_furnace": "斑れい岩磨きレンガ炉", + "block.mineralogy.diabase_slab": "輝緑岩のハーフブロック", + "block.mineralogy.diabase_brick": "輝緑岩レンガ", + "block.mineralogy.diabase_brick_stairs": "輝緑岩レンガの階段", + "block.mineralogy.diabase_brick_slab": "輝緑岩レンガのハーフブロック", + "block.mineralogy.diabase_smooth": "磨かれた輝緑岩", + "block.mineralogy.diabase_smooth_stairs": "磨かれた輝緑岩の階段", + "block.mineralogy.diabase_smooth_slab": "磨かれた輝緑岩のハーフブロック", + "block.mineralogy.diabase_smooth_brick": "磨かれた輝緑岩レンガ", + "block.mineralogy.diabase_smooth_brick_stairs": "磨かれた輝緑岩レンガの階段", + "block.mineralogy.diabase_smooth_brick_slab": "磨かれた輝緑岩レンガのハーフブロック", + "block.mineralogy.diabase_wall": "輝緑岩の塀", + "block.mineralogy.diabase_brick_wall": "輝緑岩レンガの塀", + "block.mineralogy.diabase_smooth_wall": "磨かれた輝緑岩の塀", + "block.mineralogy.diabase_smooth_brick_wall": "磨かれた輝緑岩レンガの塀", + "block.mineralogy.diabase_furnace": "輝緑岩のかまど", + "block.mineralogy.diabase_brick_furnace": "輝緑岩レンガのかまど", + "block.mineralogy.diabase_smooth_furnace": "磨かれた輝緑岩のかまど", + "block.mineralogy.diabase_smooth_brick_furnace": "磨かれた輝緑岩レンガのかまど", + "block.mineralogy.gabbro": "はんれい岩", + "block.mineralogy.gabbro_stairs": "はんれい岩の階段", + "block.mineralogy.gabbro_slab": "はんれい岩のハーフブロック", + "block.mineralogy.gabbro_brick": "はんれい岩レンガ", + "block.mineralogy.gabbro_brick_stairs": "はんれい岩レンガの階段", + "block.mineralogy.gabbro_brick_slab": "はんれい岩レンガのハーフブロック", + "block.mineralogy.gabbro_smooth": "磨かれたはんれい岩", + "block.mineralogy.gabbro_smooth_stairs": "磨かれたはんれい岩の階段", + "block.mineralogy.gabbro_smooth_slab": "磨かれたはんれい岩のハーフブロック", + "block.mineralogy.gabbro_smooth_brick": "磨かれたはんれい岩レンガ", + "block.mineralogy.gabbro_smooth_brick_stairs": "磨かれたはんれい岩レンガの階段", + "block.mineralogy.gabbro_smooth_brick_slab": "磨かれたはんれい岩レンガのハーフブロック", + "block.mineralogy.gabbro_wall": "はんれい岩の塀", + "block.mineralogy.gabbro_brick_wall": "はんれい岩レンガの塀", + "block.mineralogy.gabbro_smooth_wall": "磨かれたはんれい岩の塀", + "block.mineralogy.gabbro_smooth_brick_wall": "磨かれたはんれい岩レンガの塀", + "block.mineralogy.gabbro_furnace": "はんれい岩のかまど", + "block.mineralogy.gabbro_brick_furnace": "はんれい岩レンガのかまど", + "block.mineralogy.gabbro_smooth_furnace": "磨かれたはんれい岩のかまど", + "block.mineralogy.gabbro_smooth_brick_furnace": "磨かれたはんれい岩レンガのかまど", "block.mineralogy.peridotite": "かんらん岩", "block.mineralogy.peridotite_stairs": "かんらん岩の階段", - "block.mineralogy.peridotite_slab": "かんらん岩スラブ", + "block.mineralogy.peridotite_slab": "かんらん岩のハーフブロック", "block.mineralogy.peridotite_brick": "かんらん岩レンガ", "block.mineralogy.peridotite_brick_stairs": "かんらん岩レンガの階段", - "block.mineralogy.peridotite_brick_slab": "かんらん岩レンガ板", - "block.mineralogy.peridotite_smooth": "研磨されたかんらん岩", - "block.mineralogy.peridotite_smooth_stairs": "かんらん岩の磨かれた階段", - "block.mineralogy.peridotite_smooth_slab": "かんらん岩研磨スラブ", - "block.mineralogy.peridotite_smooth_brick": "かんらん岩磨きレンガ", - "block.mineralogy.peridotite_smooth_brick_stairs": "かんらん岩の磨かれたレンガの階段", - "block.mineralogy.peridotite_smooth_brick_slab": "かんらん岩の磨かれたレンガのスラブ", - "block.mineralogy.peridotite_wall": "かんらん岩の壁", - "block.mineralogy.peridotite_brick_wall": "かんらん岩レンガ壁", - "block.mineralogy.peridotite_smooth_wall": "かんらん岩の磨かれた壁", - "block.mineralogy.peridotite_smooth_brick_wall": "かんらん岩の磨かれたレンガの壁", - "block.mineralogy.peridotite_furnace": "かんらん岩炉", - "block.mineralogy.peridotite_brick_furnace": "かんらん岩レンガ炉", - "block.mineralogy.peridotite_smooth_furnace": "かんらん岩研磨炉", - "block.mineralogy.peridotite_smooth_brick_furnace": "かんらん岩の磨かれたレンガ炉", + "block.mineralogy.peridotite_brick_slab": "かんらん岩レンガのハーフブロック", + "block.mineralogy.peridotite_smooth": "磨かれたかんらん岩", + "block.mineralogy.peridotite_smooth_stairs": "磨かれたかんらん岩の階段", + "block.mineralogy.peridotite_smooth_slab": "磨かれたかんらん岩のハーフブロック", + "block.mineralogy.peridotite_smooth_brick": "磨かれたかんらん岩レンガ", + "block.mineralogy.peridotite_smooth_brick_stairs": "磨かれたかんらん岩レンガの階段", + "block.mineralogy.peridotite_smooth_brick_slab": "磨かれたかんらん岩レンガのハーフブロック", + "block.mineralogy.peridotite_wall": "かんらん岩の塀", + "block.mineralogy.peridotite_brick_wall": "かんらん岩レンガの塀", + "block.mineralogy.peridotite_smooth_wall": "磨かれたかんらん岩の塀", + "block.mineralogy.peridotite_smooth_brick_wall": "磨かれたかんらん岩レンガの塀", + "block.mineralogy.peridotite_furnace": "かんらん岩のかまど", + "block.mineralogy.peridotite_brick_furnace": "かんらん岩レンガのかまど", + "block.mineralogy.peridotite_smooth_furnace": "磨かれたかんらん岩のかまど", + "block.mineralogy.peridotite_smooth_brick_furnace": "磨かれたかんらん岩レンガのかまど", "block.mineralogy.basaltic_glass": "玄武岩質ガラス", "block.mineralogy.basaltic_glass_stairs": "玄武岩質ガラスの階段", - "block.mineralogy.basaltic_glass_slab": "玄武岩質ガラス板", + "block.mineralogy.basaltic_glass_slab": "玄武岩質ガラスのハーフブロック", "block.mineralogy.basaltic_glass_brick": "玄武岩質ガラスレンガ", "block.mineralogy.basaltic_glass_brick_stairs": "玄武岩質ガラスレンガの階段", - "block.mineralogy.basaltic_glass_brick_slab": "玄武岩質ガラスレンガ板", + "block.mineralogy.basaltic_glass_brick_slab": "玄武岩質ガラスレンガのハーフブロック", "block.mineralogy.basaltic_glass_smooth": "磨かれた玄武岩質ガラス", - "block.mineralogy.basaltic_glass_smooth_stairs": "玄武岩質ガラスの磨かれた階段", - "block.mineralogy.basaltic_glass_smooth_slab": "玄武岩質ガラス研磨スラブ", - "block.mineralogy.basaltic_glass_smooth_brick": "玄武岩質ガラス磨きレンガ", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "玄武岩質ガラスの磨かれたレンガの階段", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "玄武岩質ガラスの磨かれたレンガのスラブ", - "block.mineralogy.basaltic_glass_wall": "玄武岩質ガラス壁", - "block.mineralogy.basaltic_glass_brick_wall": "玄武岩質ガラスレンガ壁", - "block.mineralogy.basaltic_glass_smooth_wall": "玄武岩質ガラスの磨かれた壁", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "玄武岩質ガラスの磨かれたレンガの壁", - "block.mineralogy.basaltic_glass_furnace": "玄武岩質ガラス炉", - "block.mineralogy.basaltic_glass_brick_furnace": "玄武岩質ガラスレンガ炉", - "block.mineralogy.basaltic_glass_smooth_furnace": "玄武岩質ガラス研磨炉", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "玄武岩質ガラス磨きレンガ炉", + "block.mineralogy.basaltic_glass_smooth_stairs": "磨かれた玄武岩質ガラスの階段", + "block.mineralogy.basaltic_glass_smooth_slab": "磨かれた玄武岩質ガラスのハーフブロック", + "block.mineralogy.basaltic_glass_smooth_brick": "磨かれた玄武岩質ガラスレンガ", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "磨かれた玄武岩質ガラスレンガの階段", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "磨かれた玄武岩質ガラスレンガのハーフブロック", + "block.mineralogy.basaltic_glass_wall": "玄武岩質ガラスの塀", + "block.mineralogy.basaltic_glass_brick_wall": "玄武岩質ガラスレンガの塀", + "block.mineralogy.basaltic_glass_smooth_wall": "磨かれた玄武岩質ガラスの塀", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "磨かれた玄武岩質ガラスレンガの塀", + "block.mineralogy.basaltic_glass_furnace": "玄武岩質ガラスのかまど", + "block.mineralogy.basaltic_glass_brick_furnace": "玄武岩質ガラスレンガのかまど", + "block.mineralogy.basaltic_glass_smooth_furnace": "磨かれた玄武岩質ガラスのかまど", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "磨かれた玄武岩質ガラスレンガのかまど", "block.mineralogy.scoria": "スコリア", "block.mineralogy.scoria_stairs": "スコリアの階段", - "block.mineralogy.scoria_slab": "スコリア板", + "block.mineralogy.scoria_slab": "スコリアのハーフブロック", "block.mineralogy.scoria_brick": "スコリアレンガ", "block.mineralogy.scoria_brick_stairs": "スコリアレンガの階段", - "block.mineralogy.scoria_brick_slab": "スコリアレンガハーフブロック", - "block.mineralogy.scoria_smooth": "ポリッシュスコリア", - "block.mineralogy.scoria_smooth_stairs": "スコリアポリッシュ階段", - "block.mineralogy.scoria_smooth_slab": "スコリア研磨スラブ", - "block.mineralogy.scoria_smooth_brick": "スコリア磨かれたレンガ", - "block.mineralogy.scoria_smooth_brick_stairs": "スコリア磨かれたレンガの階段", - "block.mineralogy.scoria_smooth_brick_slab": "スコリアポリッシュレンガスラブ", - "block.mineralogy.scoria_wall": "スコリアの壁", - "block.mineralogy.scoria_brick_wall": "スコリアレンガ壁", - "block.mineralogy.scoria_smooth_wall": "スコリア研磨壁", - "block.mineralogy.scoria_smooth_brick_wall": "スコリア磨かれたレンガの壁", - "block.mineralogy.scoria_furnace": "スコリア炉", - "block.mineralogy.scoria_brick_furnace": "スコリア煉瓦炉", - "block.mineralogy.scoria_smooth_furnace": "スコリア研磨炉", - "block.mineralogy.scoria_smooth_brick_furnace": "スコリア磨かれたレンガ炉", - "block.mineralogy.tuff": "タフ", + "block.mineralogy.scoria_brick_slab": "スコリアレンガのハーフブロック", + "block.mineralogy.scoria_smooth": "磨かれたスコリア", + "block.mineralogy.scoria_smooth_stairs": "磨かれたスコリアの階段", + "block.mineralogy.scoria_smooth_slab": "磨かれたスコリアのハーフブロック", + "block.mineralogy.scoria_smooth_brick": "磨かれたスコリアレンガ", + "block.mineralogy.scoria_smooth_brick_stairs": "磨かれたスコリアレンガの階段", + "block.mineralogy.scoria_smooth_brick_slab": "磨かれたスコリアレンガのハーフブロック", + "block.mineralogy.scoria_wall": "スコリアの塀", + "block.mineralogy.scoria_brick_wall": "スコリアレンガの塀", + "block.mineralogy.scoria_smooth_wall": "磨かれたスコリアの塀", + "block.mineralogy.scoria_smooth_brick_wall": "磨かれたスコリアレンガの塀", + "block.mineralogy.scoria_furnace": "スコリアのかまど", + "block.mineralogy.scoria_brick_furnace": "スコリアレンガのかまど", + "block.mineralogy.scoria_smooth_furnace": "磨かれたスコリアのかまど", + "block.mineralogy.scoria_smooth_brick_furnace": "磨かれたスコリアレンガのかまど", + "block.mineralogy.tuff": "凝灰岩", "block.mineralogy.tuff_stairs": "凝灰岩の階段", - "block.mineralogy.tuff_slab": "凝灰岩スラブ", - "block.mineralogy.tuff_brick": "タフブリック", + "block.mineralogy.tuff_slab": "凝灰岩のハーフブロック", + "block.mineralogy.tuff_brick": "凝灰岩レンガ", "block.mineralogy.tuff_brick_stairs": "凝灰岩レンガの階段", - "block.mineralogy.tuff_brick_slab": "凝灰岩レンガ板", + "block.mineralogy.tuff_brick_slab": "凝灰岩レンガのハーフブロック", "block.mineralogy.tuff_smooth": "磨かれた凝灰岩", - "block.mineralogy.tuff_smooth_stairs": "凝灰岩で磨かれた階段", - "block.mineralogy.tuff_smooth_slab": "凝灰岩研磨スラブ", - "block.mineralogy.tuff_smooth_brick": "凝灰岩磨きレンガ", - "block.mineralogy.tuff_smooth_brick_stairs": "凝灰岩磨かれたレンガの階段", - "block.mineralogy.tuff_smooth_brick_slab": "凝灰岩研磨レンガスラブ", - "block.mineralogy.tuff_wall": "凝灰岩の壁", - "block.mineralogy.tuff_brick_wall": "凝灰岩レンガの壁", - "block.mineralogy.tuff_smooth_wall": "凝灰岩の磨かれた壁", - "block.mineralogy.tuff_smooth_brick_wall": "凝灰岩の磨かれたレンガの壁", - "block.mineralogy.tuff_furnace": "凝灰岩炉", - "block.mineralogy.tuff_brick_furnace": "凝灰岩レンガ炉", - "block.mineralogy.tuff_smooth_furnace": "凝灰岩研磨炉", - "block.mineralogy.tuff_smooth_brick_furnace": "凝灰岩磨きレンガ炉", + "block.mineralogy.tuff_smooth_stairs": "磨かれた凝灰岩の階段", + "block.mineralogy.tuff_smooth_slab": "磨かれた凝灰岩のハーフブロック", + "block.mineralogy.tuff_smooth_brick": "磨かれた凝灰岩レンガ", + "block.mineralogy.tuff_smooth_brick_stairs": "磨かれた凝灰岩レンガの階段", + "block.mineralogy.tuff_smooth_brick_slab": "磨かれた凝灰岩レンガのハーフブロック", + "block.mineralogy.tuff_wall": "凝灰岩の塀", + "block.mineralogy.tuff_brick_wall": "凝灰岩レンガの塀", + "block.mineralogy.tuff_smooth_wall": "磨かれた凝灰岩の塀", + "block.mineralogy.tuff_smooth_brick_wall": "磨かれた凝灰岩レンガの塀", + "block.mineralogy.tuff_furnace": "凝灰岩のかまど", + "block.mineralogy.tuff_brick_furnace": "凝灰岩レンガのかまど", + "block.mineralogy.tuff_smooth_furnace": "磨かれた凝灰岩のかまど", + "block.mineralogy.tuff_smooth_brick_furnace": "磨かれた凝灰岩レンガのかまど", "block.mineralogy.siltstone": "シルト岩", "block.mineralogy.siltstone_stairs": "シルト岩の階段", - "block.mineralogy.siltstone_slab": "シルト岩の板", + "block.mineralogy.siltstone_slab": "シルト岩のハーフブロック", "block.mineralogy.siltstone_brick": "シルト岩レンガ", - "block.mineralogy.siltstone_brick_stairs": "シルト岩のレンガの階段", - "block.mineralogy.siltstone_brick_slab": "シルト岩レンガ板", + "block.mineralogy.siltstone_brick_stairs": "シルト岩レンガの階段", + "block.mineralogy.siltstone_brick_slab": "シルト岩レンガのハーフブロック", "block.mineralogy.siltstone_smooth": "磨かれたシルト岩", - "block.mineralogy.siltstone_smooth_stairs": "シルト岩で磨かれた階段", - "block.mineralogy.siltstone_smooth_slab": "シルト岩研磨スラブ", - "block.mineralogy.siltstone_smooth_brick": "シルト岩磨きレンガ", - "block.mineralogy.siltstone_smooth_brick_stairs": "シルト岩で磨かれたレンガの階段", - "block.mineralogy.siltstone_smooth_brick_slab": "シルト岩で磨かれたレンガのスラブ", - "block.mineralogy.siltstone_wall": "シルト岩の壁", - "block.mineralogy.siltstone_brick_wall": "シルト岩のレンガの壁", - "block.mineralogy.siltstone_smooth_wall": "シルト岩で磨かれた壁", - "block.mineralogy.siltstone_smooth_brick_wall": "シルト岩で磨かれたレンガの壁", - "block.mineralogy.siltstone_furnace": "シルト岩炉", - "block.mineralogy.siltstone_brick_furnace": "シルト石レンガ炉", - "block.mineralogy.siltstone_smooth_furnace": "シルト岩研磨炉", - "block.mineralogy.siltstone_smooth_brick_furnace": "シルト岩磨きレンガ炉", + "block.mineralogy.siltstone_smooth_stairs": "磨かれたシルト岩の階段", + "block.mineralogy.siltstone_smooth_slab": "磨かれたシルト岩のハーフブロック", + "block.mineralogy.siltstone_smooth_brick": "磨かれたシルト岩レンガ", + "block.mineralogy.siltstone_smooth_brick_stairs": "磨かれたシルト岩レンガの階段", + "block.mineralogy.siltstone_smooth_brick_slab": "磨かれたシルト岩レンガのハーフブロック", + "block.mineralogy.siltstone_wall": "シルト岩の塀", + "block.mineralogy.siltstone_brick_wall": "シルト岩レンガの塀", + "block.mineralogy.siltstone_smooth_wall": "磨かれたシルト岩の塀", + "block.mineralogy.siltstone_smooth_brick_wall": "磨かれたシルト岩レンガの塀", + "block.mineralogy.siltstone_furnace": "シルト岩のかまど", + "block.mineralogy.siltstone_brick_furnace": "シルト岩レンガのかまど", + "block.mineralogy.siltstone_smooth_furnace": "磨かれたシルト岩のかまど", + "block.mineralogy.siltstone_smooth_brick_furnace": "磨かれたシルト岩レンガのかまど", "block.mineralogy.rock_salt": "岩塩", "block.mineralogy.rock_salt_stairs": "岩塩の階段", - "block.mineralogy.rock_salt_slab": "岩塩の板", + "block.mineralogy.rock_salt_slab": "岩塩のハーフブロック", "block.mineralogy.rock_salt_brick": "岩塩レンガ", - "block.mineralogy.rock_salt_brick_stairs": "岩塩レンガ階段", - "block.mineralogy.rock_salt_brick_slab": "岩塩レンガ板", - "block.mineralogy.rock_salt_smooth": "磨き岩塩", - "block.mineralogy.rock_salt_smooth_stairs": "岩塩磨き階段", - "block.mineralogy.rock_salt_smooth_slab": "岩塩研磨スラブ", - "block.mineralogy.rock_salt_smooth_brick": "岩塩磨きレンガ", - "block.mineralogy.rock_salt_smooth_brick_stairs": "岩塩磨きレンガ階段", - "block.mineralogy.rock_salt_smooth_brick_slab": "岩塩磨きレンガ板", - "block.mineralogy.rock_salt_wall": "岩塩の壁", - "block.mineralogy.rock_salt_brick_wall": "岩塩レンガ壁", - "block.mineralogy.rock_salt_smooth_wall": "岩塩磨き壁", - "block.mineralogy.rock_salt_smooth_brick_wall": "岩塩で磨いたレンガの壁", - "block.mineralogy.rock_salt_furnace": "岩塩炉", - "block.mineralogy.rock_salt_brick_furnace": "岩塩煉瓦炉", - "block.mineralogy.rock_salt_smooth_furnace": "岩塩磨き炉", - "block.mineralogy.rock_salt_smooth_brick_furnace": "岩塩磨きレンガ炉", + "block.mineralogy.rock_salt_brick_stairs": "岩塩レンガの階段", + "block.mineralogy.rock_salt_brick_slab": "岩塩レンガのハーフブロック", + "block.mineralogy.rock_salt_smooth": "磨かれた岩塩", + "block.mineralogy.rock_salt_smooth_stairs": "磨かれた岩塩の階段", + "block.mineralogy.rock_salt_smooth_slab": "磨かれた岩塩のハーフブロック", + "block.mineralogy.rock_salt_smooth_brick": "磨かれた岩塩レンガ", + "block.mineralogy.rock_salt_smooth_brick_stairs": "磨かれた岩塩レンガの階段", + "block.mineralogy.rock_salt_smooth_brick_slab": "磨かれた岩塩レンガのハーフブロック", + "block.mineralogy.rock_salt_wall": "岩塩の塀", + "block.mineralogy.rock_salt_brick_wall": "岩塩レンガの塀", + "block.mineralogy.rock_salt_smooth_wall": "磨かれた岩塩の塀", + "block.mineralogy.rock_salt_smooth_brick_wall": "磨かれた岩塩レンガの塀", + "block.mineralogy.rock_salt_furnace": "岩塩のかまど", + "block.mineralogy.rock_salt_brick_furnace": "岩塩レンガのかまど", + "block.mineralogy.rock_salt_smooth_furnace": "磨かれた岩塩のかまど", + "block.mineralogy.rock_salt_smooth_brick_furnace": "磨かれた岩塩レンガのかまど", "block.mineralogy.hornfels": "ホルンフェルス", "block.mineralogy.hornfels_stairs": "ホルンフェルスの階段", - "block.mineralogy.hornfels_slab": "ホルンフェルス板", + "block.mineralogy.hornfels_slab": "ホルンフェルスのハーフブロック", "block.mineralogy.hornfels_brick": "ホルンフェルスレンガ", - "block.mineralogy.hornfels_brick_stairs": "ホルンフェルスのレンガ階段", - "block.mineralogy.hornfels_brick_slab": "ホルンフェルスのレンガ板", - "block.mineralogy.hornfels_smooth": "ポリッシュドホルンフェルス", - "block.mineralogy.hornfels_smooth_stairs": "ホルンフェルスの磨かれた階段", - "block.mineralogy.hornfels_smooth_slab": "ホルンフェルス研磨スラブ", - "block.mineralogy.hornfels_smooth_brick": "ホルンフェルス磨きレンガ", - "block.mineralogy.hornfels_smooth_brick_stairs": "ホルンフェルスの磨かれたレンガの階段", - "block.mineralogy.hornfels_smooth_brick_slab": "ホルンフェルス磨きレンガ板", - "block.mineralogy.hornfels_wall": "ホルンフェルスの壁", - "block.mineralogy.hornfels_brick_wall": "ホルンフェルスのレンガの壁", - "block.mineralogy.hornfels_smooth_wall": "ホルンフェルスの磨かれた壁", - "block.mineralogy.hornfels_smooth_brick_wall": "ホルンフェルスの磨かれたレンガの壁", - "block.mineralogy.hornfels_furnace": "ホルンフェルス炉", - "block.mineralogy.hornfels_brick_furnace": "ホルンフェルス煉瓦炉", - "block.mineralogy.hornfels_smooth_furnace": "ホルンフェルス研磨炉", - "block.mineralogy.hornfels_smooth_brick_furnace": "ホルンフェルス磨きレンガ炉", - "block.mineralogy.quartzite": "クォーツァイト", - "block.mineralogy.quartzite_stairs": "珪岩の階段", - "block.mineralogy.quartzite_slab": "珪岩スラブ", - "block.mineralogy.quartzite_brick": "珪岩レンガ", - "block.mineralogy.quartzite_brick_stairs": "珪岩レンガの階段", - "block.mineralogy.quartzite_brick_slab": "珪岩レンガ板", - "block.mineralogy.quartzite_smooth": "磨かれた珪岩", - "block.mineralogy.quartzite_smooth_stairs": "珪岩の磨かれた階段", - "block.mineralogy.quartzite_smooth_slab": "珪岩研磨スラブ", - "block.mineralogy.quartzite_smooth_brick": "珪岩磨きレンガ", - "block.mineralogy.quartzite_smooth_brick_stairs": "珪岩の磨かれたレンガの階段", - "block.mineralogy.quartzite_smooth_brick_slab": "珪岩の磨かれたレンガのスラブ", - "block.mineralogy.quartzite_wall": "珪岩の壁", - "block.mineralogy.quartzite_brick_wall": "珪岩レンガの壁", - "block.mineralogy.quartzite_smooth_wall": "珪岩の磨かれた壁", - "block.mineralogy.quartzite_smooth_brick_wall": "珪岩の磨かれたレンガの壁", - "block.mineralogy.quartzite_furnace": "珪岩炉", - "block.mineralogy.quartzite_brick_furnace": "珪岩レンガ炉", - "block.mineralogy.quartzite_smooth_furnace": "珪岩研磨炉", - "block.mineralogy.quartzite_smooth_brick_furnace": "珪岩磨きレンガ炉", + "block.mineralogy.hornfels_brick_stairs": "ホルンフェルスレンガの階段", + "block.mineralogy.hornfels_brick_slab": "ホルンフェルスレンガのハーフブロック", + "block.mineralogy.hornfels_smooth": "磨かれたホルンフェルス", + "block.mineralogy.hornfels_smooth_stairs": "磨かれたホルンフェルスの階段", + "block.mineralogy.hornfels_smooth_slab": "磨かれたホルンフェルスのハーフブロック", + "block.mineralogy.hornfels_smooth_brick": "磨かれたホルンフェルスレンガ", + "block.mineralogy.hornfels_smooth_brick_stairs": "磨かれたホルンフェルスレンガの階段", + "block.mineralogy.hornfels_smooth_brick_slab": "磨かれたホルンフェルスレンガのハーフブロック", + "block.mineralogy.hornfels_wall": "ホルンフェルスの塀", + "block.mineralogy.hornfels_brick_wall": "ホルンフェルスレンガの塀", + "block.mineralogy.hornfels_smooth_wall": "磨かれたホルンフェルスの塀", + "block.mineralogy.hornfels_smooth_brick_wall": "磨かれたホルンフェルスレンガの塀", + "block.mineralogy.hornfels_furnace": "ホルンフェルスのかまど", + "block.mineralogy.hornfels_brick_furnace": "ホルンフェルスレンガのかまど", + "block.mineralogy.hornfels_smooth_furnace": "磨かれたホルンフェルスのかまど", + "block.mineralogy.hornfels_smooth_brick_furnace": "磨かれたホルンフェルスレンガのかまど", + "block.mineralogy.quartzite": "石英岩", + "block.mineralogy.quartzite_stairs": "石英岩の階段", + "block.mineralogy.quartzite_slab": "石英岩のハーフブロック", + "block.mineralogy.quartzite_brick": "石英岩レンガ", + "block.mineralogy.quartzite_brick_stairs": "石英岩レンガの階段", + "block.mineralogy.quartzite_brick_slab": "石英岩レンガのハーフブロック", + "block.mineralogy.quartzite_smooth": "磨かれた石英岩", + "block.mineralogy.quartzite_smooth_stairs": "磨かれた石英岩の階段", + "block.mineralogy.quartzite_smooth_slab": "磨かれた石英岩のハーフブロック", + "block.mineralogy.quartzite_smooth_brick": "磨かれた石英岩レンガ", + "block.mineralogy.quartzite_smooth_brick_stairs": "磨かれた石英岩レンガの階段", + "block.mineralogy.quartzite_smooth_brick_slab": "磨かれた石英岩レンガのハーフブロック", + "block.mineralogy.quartzite_wall": "石英岩の塀", + "block.mineralogy.quartzite_brick_wall": "石英岩レンガの塀", + "block.mineralogy.quartzite_smooth_wall": "磨かれた石英岩の塀", + "block.mineralogy.quartzite_smooth_brick_wall": "磨かれた石英岩レンガの塀", + "block.mineralogy.quartzite_furnace": "石英岩のかまど", + "block.mineralogy.quartzite_brick_furnace": "石英岩レンガのかまど", + "block.mineralogy.quartzite_smooth_furnace": "磨かれた石英岩のかまど", + "block.mineralogy.quartzite_smooth_brick_furnace": "磨かれた石英岩レンガのかまど", "block.mineralogy.novaculite": "ノバキュライト", "block.mineralogy.novaculite_stairs": "ノバキュライトの階段", - "block.mineralogy.novaculite_slab": "ノバキュライトスラブ", + "block.mineralogy.novaculite_slab": "ノバキュライトのハーフブロック", "block.mineralogy.novaculite_brick": "ノバキュライトレンガ", "block.mineralogy.novaculite_brick_stairs": "ノバキュライトレンガの階段", - "block.mineralogy.novaculite_brick_slab": "ノバキュライト レンガ スラブ", - "block.mineralogy.novaculite_smooth": "ポリッシュドノバキュライト", - "block.mineralogy.novaculite_smooth_stairs": "ノバキュライトの磨かれた階段", - "block.mineralogy.novaculite_smooth_slab": "ノバキュライト研磨スラブ", - "block.mineralogy.novaculite_smooth_brick": "ノバキュライト磨きレンガ", - "block.mineralogy.novaculite_smooth_brick_stairs": "ノバキュライトの磨かれたレンガの階段", - "block.mineralogy.novaculite_smooth_brick_slab": "ノバキュライトポリッシュレンガスラブ", - "block.mineralogy.novaculite_wall": "ノバキュライトの壁", - "block.mineralogy.novaculite_brick_wall": "ノバキュライトのレンガの壁", - "block.mineralogy.novaculite_smooth_wall": "ノバキュライトの磨かれた壁", - "block.mineralogy.novaculite_smooth_brick_wall": "ノバキュライトの磨かれたレンガ壁", - "block.mineralogy.novaculite_furnace": "ノバキュライト炉", - "block.mineralogy.novaculite_brick_furnace": "ノバキュライトレンガ炉", - "block.mineralogy.novaculite_smooth_furnace": "ノバキュライト研磨炉", - "block.mineralogy.novaculite_smooth_brick_furnace": "ノバキュライト磨きレンガ炉", + "block.mineralogy.novaculite_brick_slab": "ノバキュライトレンガのハーフブロック", + "block.mineralogy.novaculite_smooth": "磨かれたノバキュライト", + "block.mineralogy.novaculite_smooth_stairs": "磨かれたノバキュライトの階段", + "block.mineralogy.novaculite_smooth_slab": "磨かれたノバキュライトのハーフブロック", + "block.mineralogy.novaculite_smooth_brick": "磨かれたノバキュライトレンガ", + "block.mineralogy.novaculite_smooth_brick_stairs": "磨かれたノバキュライトレンガの階段", + "block.mineralogy.novaculite_smooth_brick_slab": "磨かれたノバキュライトレンガのハーフブロック", + "block.mineralogy.novaculite_wall": "ノバキュライトの塀", + "block.mineralogy.novaculite_brick_wall": "ノバキュライトレンガの塀", + "block.mineralogy.novaculite_smooth_wall": "磨かれたノバキュライトの塀", + "block.mineralogy.novaculite_smooth_brick_wall": "磨かれたノバキュライトレンガの塀", + "block.mineralogy.novaculite_furnace": "ノバキュライトのかまど", + "block.mineralogy.novaculite_brick_furnace": "ノバキュライトレンガのかまど", + "block.mineralogy.novaculite_smooth_furnace": "磨かれたノバキュライトのかまど", + "block.mineralogy.novaculite_smooth_brick_furnace": "磨かれたノバキュライトレンガのかまど", "block.mineralogy.chalk": "チョーク", - "item.mineralogy.chalk_dust": "チョークパウダー", + "item.mineralogy.chalk_dust": "チョーク粉末", "item.mineralogy.salt_dust": "塩", "item.mineralogy.rock_salt_dust": "岩塩の結晶", "block.mineralogy.rocksaltlamp": "岩塩ランプ", - "block.mineralogy.rocksaltstreetlamp": "岩塩街路灯", - "block.mineralogy.andesite_relief_axe": "安山岩の斧レリーフ", - "block.mineralogy.andesite_relief_blank": "安山岩のブランク レリーフ", - "block.mineralogy.andesite_relief_cross": "安山岩の十字レリーフ", - "block.mineralogy.andesite_relief_hammer": "安山岩のハンマーレリーフ", - "block.mineralogy.andesite_relief_hoe": "安山岩の鍬レリーフ", - "block.mineralogy.andesite_relief_horizontal": "安山岩の水平レリーフ", - "block.mineralogy.andesite_relief_i": "安山岩 I レリーフ", - "block.mineralogy.andesite_relief_left": "安山岩の左レリーフ", - "block.mineralogy.andesite_relief_pickaxe": "安山岩のつるはしレリーフ", - "block.mineralogy.andesite_relief_plus": "安山岩プラス レリーフ", - "block.mineralogy.andesite_relief_right": "安山岩の右レリーフ", - "block.mineralogy.andesite_relief_sword": "安山岩の剣レリーフ", - "block.mineralogy.andesite_relief_vertical": "安山岩の垂直レリーフ", - "block.mineralogy.basalt_relief_axe": "玄武岩の斧のレリーフ", - "block.mineralogy.basalt_relief_blank": "玄武岩のブランクレリーフ", - "block.mineralogy.basalt_relief_cross": "玄武岩クロスレリーフ", - "block.mineralogy.basalt_relief_hammer": "玄武岩ハンマーレリーフ", - "block.mineralogy.basalt_relief_hoe": "玄武岩の鍬レリーフ", - "block.mineralogy.basalt_relief_horizontal": "玄武岩の水平レリーフ", - "block.mineralogy.basalt_relief_i": "玄武岩 I レリーフ", - "block.mineralogy.basalt_relief_left": "玄武岩の左レリーフ", - "block.mineralogy.basalt_relief_pickaxe": "玄武岩のつるはしレリーフ", - "block.mineralogy.basalt_relief_plus": "バサルトプラス レリーフ", - "block.mineralogy.basalt_relief_right": "玄武岩の右レリーフ", - "block.mineralogy.basalt_relief_sword": "玄武岩の剣のレリーフ", - "block.mineralogy.basalt_relief_vertical": "玄武岩の垂直レリーフ", - "block.mineralogy.diorite_relief_axe": "閃緑岩の斧のレリーフ", - "block.mineralogy.diorite_relief_blank": "閃緑岩のブランクレリーフ", - "block.mineralogy.diorite_relief_cross": "閃緑岩のクロスレリーフ", - "block.mineralogy.diorite_relief_hammer": "閃緑岩のハンマーレリーフ", - "block.mineralogy.diorite_relief_hoe": "閃緑岩の鍬レリーフ", - "block.mineralogy.diorite_relief_horizontal": "閃緑岩の水平レリーフ", - "block.mineralogy.diorite_relief_i": "閃緑岩 I レリーフ", - "block.mineralogy.diorite_relief_left": "閃緑岩の左レリーフ", - "block.mineralogy.diorite_relief_pickaxe": "閃緑岩のつるはしレリーフ", - "block.mineralogy.diorite_relief_plus": "閃緑岩プラス レリーフ", - "block.mineralogy.diorite_relief_right": "閃緑岩の右レリーフ", - "block.mineralogy.diorite_relief_sword": "閃緑岩の剣のレリーフ", - "block.mineralogy.diorite_relief_vertical": "閃緑岩の垂直レリーフ", - "block.mineralogy.granite_relief_axe": "花崗岩の斧のレリーフ", - "block.mineralogy.granite_relief_blank": "花崗岩のブランクレリーフ", - "block.mineralogy.granite_relief_cross": "花崗岩の十字レリーフ", - "block.mineralogy.granite_relief_hammer": "花崗岩のハンマーレリーフ", - "block.mineralogy.granite_relief_hoe": "花崗岩の鍬レリーフ", - "block.mineralogy.granite_relief_horizontal": "花崗岩の水平レリーフ", - "block.mineralogy.granite_relief_i": "花崗岩 I レリーフ", - "block.mineralogy.granite_relief_left": "花崗岩の左レリーフ", - "block.mineralogy.granite_relief_pickaxe": "花崗岩のつるはしレリーフ", - "block.mineralogy.granite_relief_plus": "御影石プラス レリーフ", - "block.mineralogy.granite_relief_right": "花崗岩の右レリーフ", - "block.mineralogy.granite_relief_sword": "花崗岩の剣レリーフ", - "block.mineralogy.granite_relief_vertical": "花崗岩の垂直レリーフ", - "block.mineralogy.rhyolite_relief_axe": "流紋岩の斧のレリーフ", - "block.mineralogy.rhyolite_relief_blank": "流紋岩のブランクレリーフ", - "block.mineralogy.rhyolite_relief_cross": "流紋岩クロスレリーフ", - "block.mineralogy.rhyolite_relief_hammer": "流紋岩のハンマーレリーフ", - "block.mineralogy.rhyolite_relief_hoe": "流紋岩の鍬レリーフ", - "block.mineralogy.rhyolite_relief_horizontal": "流紋岩の水平レリーフ", - "block.mineralogy.rhyolite_relief_i": "流紋岩 I レリーフ", - "block.mineralogy.rhyolite_relief_left": "流紋岩の左レリーフ", - "block.mineralogy.rhyolite_relief_pickaxe": "流紋岩のつるはしレリーフ", - "block.mineralogy.rhyolite_relief_plus": "流紋岩プラス レリーフ", - "block.mineralogy.rhyolite_relief_right": "流紋岩の右レリーフ", - "block.mineralogy.rhyolite_relief_sword": "流紋岩の剣レリーフ", - "block.mineralogy.rhyolite_relief_vertical": "流紋岩の垂直レリーフ", - "block.mineralogy.pegmatite_relief_axe": "ペグマタイトアックス レリーフ", - "block.mineralogy.pegmatite_relief_blank": "ペグマタイト ブランク レリーフ", - "block.mineralogy.pegmatite_relief_cross": "ペグマタイト クロス レリーフ", - "block.mineralogy.pegmatite_relief_hammer": "ペグマタイトハンマーレリーフ", - "block.mineralogy.pegmatite_relief_hoe": "ペグマタイトのクワ レリーフ", - "block.mineralogy.pegmatite_relief_horizontal": "ペグマタイトの水平レリーフ", - "block.mineralogy.pegmatite_relief_i": "ペグマタイト I レリーフ", - "block.mineralogy.pegmatite_relief_left": "ペグマタイト左レリーフ", - "block.mineralogy.pegmatite_relief_pickaxe": "ペグマタイトのつるはしレリーフ", - "block.mineralogy.pegmatite_relief_plus": "ペグマタイトプラスレリーフ", - "block.mineralogy.pegmatite_relief_right": "ペグマタイト右レリーフ", - "block.mineralogy.pegmatite_relief_sword": "ペグマタイト剣レリーフ", - "block.mineralogy.pegmatite_relief_vertical": "ペグマタイトの垂直レリーフ", - "block.mineralogy.shale_relief_axe": "シェールアックス レリーフ", - "block.mineralogy.shale_relief_blank": "シェールブランクレリーフ", - "block.mineralogy.shale_relief_cross": "シェールクロスリリーフ", - "block.mineralogy.shale_relief_hammer": "シェールハンマーレリーフ", - "block.mineralogy.shale_relief_hoe": "頁岩鍬レリーフ", - "block.mineralogy.shale_relief_horizontal": "頁岩の水平起伏", - "block.mineralogy.shale_relief_i": "シェール I リリーフ", - "block.mineralogy.shale_relief_left": "シェール左リリーフ", - "block.mineralogy.shale_relief_pickaxe": "頁岩のつるはしレリーフ", - "block.mineralogy.shale_relief_plus": "シェールプラス・リリーフ", - "block.mineralogy.shale_relief_right": "シェール権救済", - "block.mineralogy.shale_relief_sword": "頁岩の剣のレリーフ", - "block.mineralogy.shale_relief_vertical": "頁岩の垂直起伏", - "block.mineralogy.conglomerate_relief_axe": "複合企業の斧のレリーフ", - "block.mineralogy.conglomerate_relief_blank": "複合企業のブランク レリーフ", - "block.mineralogy.conglomerate_relief_cross": "複合企業のクロスリリーフ", - "block.mineralogy.conglomerate_relief_hammer": "複合企業のハンマーレリーフ", - "block.mineralogy.conglomerate_relief_hoe": "複合企業のホーレリーフ", - "block.mineralogy.conglomerate_relief_horizontal": "複合体の水平レリーフ", - "block.mineralogy.conglomerate_relief_i": "コングロマリット I リリーフ", - "block.mineralogy.conglomerate_relief_left": "複合企業の左救済", - "block.mineralogy.conglomerate_relief_pickaxe": "複合企業のつるはしのレリーフ", - "block.mineralogy.conglomerate_relief_plus": "コングロマリット プラス リリーフ", - "block.mineralogy.conglomerate_relief_right": "複合企業の権利救済", - "block.mineralogy.conglomerate_relief_sword": "複合企業の剣のレリーフ", - "block.mineralogy.conglomerate_relief_vertical": "複合企業の垂直レリーフ", - "block.mineralogy.dolomite_relief_axe": "ドロマイトの斧のレリーフ", - "block.mineralogy.dolomite_relief_blank": "ドロマイト ブランク レリーフ", - "block.mineralogy.dolomite_relief_cross": "ドロマイト クロス レリーフ", - "block.mineralogy.dolomite_relief_hammer": "ドロマイトハンマーレリーフ", - "block.mineralogy.dolomite_relief_hoe": "ドロマイトの鍬レリーフ", - "block.mineralogy.dolomite_relief_horizontal": "ドロマイト水平レリーフ", - "block.mineralogy.dolomite_relief_i": "ドロミテ I レリーフ", - "block.mineralogy.dolomite_relief_left": "ドロマイト左レリーフ", - "block.mineralogy.dolomite_relief_pickaxe": "ドロマイトのつるはしレリーフ", - "block.mineralogy.dolomite_relief_plus": "ドロマイト プラス リリーフ", - "block.mineralogy.dolomite_relief_right": "ドロマイト右レリーフ", - "block.mineralogy.dolomite_relief_sword": "ドロマイト剣レリーフ", - "block.mineralogy.dolomite_relief_vertical": "ドロマイト垂直レリーフ", - "block.mineralogy.limestone_relief_axe": "石灰岩の斧のレリーフ", - "block.mineralogy.limestone_relief_blank": "石灰岩のブランクレリーフ", - "block.mineralogy.limestone_relief_cross": "石灰岩のクロスレリーフ", - "block.mineralogy.limestone_relief_hammer": "石灰岩のハンマーレリーフ", - "block.mineralogy.limestone_relief_hoe": "石灰岩の鍬レリーフ", - "block.mineralogy.limestone_relief_horizontal": "石灰岩の水平レリーフ", - "block.mineralogy.limestone_relief_i": "石灰岩 I レリーフ", - "block.mineralogy.limestone_relief_left": "石灰岩の左レリーフ", - "block.mineralogy.limestone_relief_pickaxe": "石灰岩のつるはしレリーフ", - "block.mineralogy.limestone_relief_plus": "ライムストーン プラス レリーフ", - "block.mineralogy.limestone_relief_right": "石灰岩の右レリーフ", - "block.mineralogy.limestone_relief_sword": "石灰岩の剣のレリーフ", - "block.mineralogy.limestone_relief_vertical": "石灰岩の垂直レリーフ", - "block.mineralogy.marble_relief_axe": "大理石の斧のレリーフ", - "block.mineralogy.marble_relief_blank": "大理石のブランクレリーフ", - "block.mineralogy.marble_relief_cross": "大理石クロスレリーフ", - "block.mineralogy.marble_relief_hammer": "大理石のハンマーレリーフ", - "block.mineralogy.marble_relief_hoe": "大理石の鍬レリーフ", - "block.mineralogy.marble_relief_horizontal": "大理石の水平レリーフ", - "block.mineralogy.marble_relief_i": "マーブル I レリーフ", - "block.mineralogy.marble_relief_left": "大理石の左レリーフ", - "block.mineralogy.marble_relief_pickaxe": "大理石のつるはしレリーフ", - "block.mineralogy.marble_relief_plus": "マーブルプラス レリーフ", - "block.mineralogy.marble_relief_right": "大理石の右レリーフ", - "block.mineralogy.marble_relief_sword": "大理石の剣レリーフ", - "block.mineralogy.marble_relief_vertical": "大理石の垂直レリーフ", - "block.mineralogy.slate_relief_axe": "石板の斧のレリーフ", - "block.mineralogy.slate_relief_blank": "スレートブランクレリーフ", - "block.mineralogy.slate_relief_cross": "スレートクロスレリーフ", - "block.mineralogy.slate_relief_hammer": "スレートハンマーレリーフ", - "block.mineralogy.slate_relief_hoe": "スレートクワレリーフ", - "block.mineralogy.slate_relief_horizontal": "スレート水平レリーフ", - "block.mineralogy.slate_relief_i": "スレート I レリーフ", - "block.mineralogy.slate_relief_left": "スレート左レリーフ", - "block.mineralogy.slate_relief_pickaxe": "石板のつるはしレリーフ", - "block.mineralogy.slate_relief_plus": "スレートプラス レリーフ", - "block.mineralogy.slate_relief_right": "スレート右レリーフ", - "block.mineralogy.slate_relief_sword": "石板の剣のレリーフ", - "block.mineralogy.slate_relief_vertical": "スレート垂直レリーフ", - "block.mineralogy.schist_relief_axe": "シストアックス レリーフ", - "block.mineralogy.schist_relief_blank": "片岩ブランクレリーフ", - "block.mineralogy.schist_relief_cross": "シストクロスレリーフ", - "block.mineralogy.schist_relief_hammer": "シストハンマーレリーフ", - "block.mineralogy.schist_relief_hoe": "片岩鍬レリーフ", - "block.mineralogy.schist_relief_horizontal": "片岩の水平レリーフ", - "block.mineralogy.schist_relief_i": "シスト I レリーフ", - "block.mineralogy.schist_relief_left": "片岩の左レリーフ", - "block.mineralogy.schist_relief_pickaxe": "片岩のつるはしレリーフ", - "block.mineralogy.schist_relief_plus": "シストプラスレリーフ", - "block.mineralogy.schist_relief_right": "片岩の右レリーフ", - "block.mineralogy.schist_relief_sword": "片岩剣レリーフ", - "block.mineralogy.schist_relief_vertical": "片岩の垂直レリーフ", - "block.mineralogy.gneiss_relief_axe": "片麻岩の斧のレリーフ", - "block.mineralogy.gneiss_relief_blank": "片麻岩のブランク レリーフ", - "block.mineralogy.gneiss_relief_cross": "片麻岩クロスレリーフ", - "block.mineralogy.gneiss_relief_hammer": "片麻岩ハンマーレリーフ", - "block.mineralogy.gneiss_relief_hoe": "片麻岩の鍬レリーフ", - "block.mineralogy.gneiss_relief_horizontal": "片麻岩の水平起伏", - "block.mineralogy.gneiss_relief_i": "片麻岩 I レリーフ", - "block.mineralogy.gneiss_relief_left": "片麻岩左レリーフ", - "block.mineralogy.gneiss_relief_pickaxe": "片麻岩のつるはしレリーフ", - "block.mineralogy.gneiss_relief_plus": "片麻岩プラス レリーフ", - "block.mineralogy.gneiss_relief_right": "片麻岩の右側のレリーフ", - "block.mineralogy.gneiss_relief_sword": "片麻岩の剣のレリーフ", - "block.mineralogy.gneiss_relief_vertical": "片麻岩の垂直起伏", - "block.mineralogy.phyllite_relief_axe": "千枚斧のレリーフ", - "block.mineralogy.phyllite_relief_blank": "千枚岩ブランクレリーフ", - "block.mineralogy.phyllite_relief_cross": "千枚岩クロスレリーフ", - "block.mineralogy.phyllite_relief_hammer": "千枚岩ハンマーレリーフ", - "block.mineralogy.phyllite_relief_hoe": "千枚岩鍬レリーフ", - "block.mineralogy.phyllite_relief_horizontal": "千枚岩水平レリーフ", - "block.mineralogy.phyllite_relief_i": "千枚岩 I レリーフ", - "block.mineralogy.phyllite_relief_left": "千枚岩左レリーフ", - "block.mineralogy.phyllite_relief_pickaxe": "千枚岩のつるはしレリーフ", - "block.mineralogy.phyllite_relief_plus": "フィライトプラスリリーフ", - "block.mineralogy.phyllite_relief_right": "千枚岩右レリーフ", - "block.mineralogy.phyllite_relief_sword": "千枚岩剣レリーフ", - "block.mineralogy.phyllite_relief_vertical": "千枚岩垂直レリーフ", - "block.mineralogy.amphibolite_relief_axe": "角閃石の斧のレリーフ", - "block.mineralogy.amphibolite_relief_blank": "角閃岩のブランク レリーフ", - "block.mineralogy.amphibolite_relief_cross": "角閃石クロスレリーフ", - "block.mineralogy.amphibolite_relief_hammer": "角閃岩のハンマーレリーフ", - "block.mineralogy.amphibolite_relief_hoe": "角閃岩の鍬レリーフ", - "block.mineralogy.amphibolite_relief_horizontal": "角閃石の水平レリーフ", - "block.mineralogy.amphibolite_relief_i": "角閃岩 I レリーフ", - "block.mineralogy.amphibolite_relief_left": "角閃岩の左レリーフ", - "block.mineralogy.amphibolite_relief_pickaxe": "角閃岩のつるはしレリーフ", - "block.mineralogy.amphibolite_relief_plus": "角閃石プラス レリーフ", - "block.mineralogy.amphibolite_relief_right": "角閃岩の右レリーフ", - "block.mineralogy.amphibolite_relief_sword": "角閃石剣レリーフ", - "block.mineralogy.amphibolite_relief_vertical": "角閃岩の垂直レリーフ", - "block.mineralogy.diabase_relief_axe": "輝緑岩の斧レリーフ", - "block.mineralogy.diabase_relief_blank": "輝緑岩ブランクレリーフ", - "block.mineralogy.diabase_relief_cross": "輝緑岩クロスレリーフ", - "block.mineralogy.diabase_relief_hammer": "輝緑岩ハンマーレリーフ", - "block.mineralogy.diabase_relief_hoe": "ダイアベースクワレリーフ", - "block.mineralogy.diabase_relief_horizontal": "輝緑岩の水平レリーフ", - "block.mineralogy.diabase_relief_i": "ダイアベース I レリーフ", - "block.mineralogy.diabase_relief_left": "ダイアベース左レリーフ", - "block.mineralogy.diabase_relief_pickaxe": "輝緑岩のつるはしレリーフ", - "block.mineralogy.diabase_relief_plus": "ダイアベースプラス レリーフ", - "block.mineralogy.diabase_relief_right": "ダイアベース右レリーフ", - "block.mineralogy.diabase_relief_sword": "ダイアベースソード レリーフ", - "block.mineralogy.diabase_relief_vertical": "輝緑岩の垂直レリーフ", - "block.mineralogy.gabbro_relief_axe": "斑れい岩斧レリーフ", - "block.mineralogy.gabbro_relief_blank": "斑れい岩ブランクレリーフ", - "block.mineralogy.gabbro_relief_cross": "斑れい岩クロスレリーフ", - "block.mineralogy.gabbro_relief_hammer": "斑れい岩ハンマーレリーフ", - "block.mineralogy.gabbro_relief_hoe": "斑れい岩鍬レリーフ", - "block.mineralogy.gabbro_relief_horizontal": "斑れい岩の水平レリーフ", - "block.mineralogy.gabbro_relief_i": "斑れい岩 I レリーフ", - "block.mineralogy.gabbro_relief_left": "斑れい岩左レリーフ", - "block.mineralogy.gabbro_relief_pickaxe": "斑れい岩のつるはしレリーフ", - "block.mineralogy.gabbro_relief_plus": "ガブロプラス レリーフ", - "block.mineralogy.gabbro_relief_right": "斑れい岩右レリーフ", - "block.mineralogy.gabbro_relief_sword": "斑れい岩剣レリーフ", - "block.mineralogy.gabbro_relief_vertical": "斑れい岩垂直レリーフ", - "block.mineralogy.peridotite_relief_axe": "かんらん岩の斧のレリーフ", - "block.mineralogy.peridotite_relief_blank": "かんらん岩ブランクレリーフ", - "block.mineralogy.peridotite_relief_cross": "かんらん岩クロスレリーフ", - "block.mineralogy.peridotite_relief_hammer": "かんらん岩ハンマーレリーフ", - "block.mineralogy.peridotite_relief_hoe": "かんらん岩の鍬レリーフ", - "block.mineralogy.peridotite_relief_horizontal": "かんらん岩の水平レリーフ", - "block.mineralogy.peridotite_relief_i": "かんらん岩 I レリーフ", - "block.mineralogy.peridotite_relief_left": "かんらん岩左レリーフ", - "block.mineralogy.peridotite_relief_pickaxe": "かんらん岩のつるはしレリーフ", - "block.mineralogy.peridotite_relief_plus": "ペリドタイトプラスレリーフ", - "block.mineralogy.peridotite_relief_right": "かんらん岩の右レリーフ", - "block.mineralogy.peridotite_relief_sword": "かんらん岩剣レリーフ", - "block.mineralogy.peridotite_relief_vertical": "かんらん岩の垂直レリーフ", - "block.mineralogy.basaltic_glass_relief_axe": "玄武岩質ガラスの斧のレリーフ", - "block.mineralogy.basaltic_glass_relief_blank": "玄武岩質ガラスのブランクレリーフ", - "block.mineralogy.basaltic_glass_relief_cross": "玄武岩質ガラスのクロスレリーフ", - "block.mineralogy.basaltic_glass_relief_hammer": "玄武岩質ガラスのハンマーレリーフ", - "block.mineralogy.basaltic_glass_relief_hoe": "玄武岩質ガラスの鍬レリーフ", - "block.mineralogy.basaltic_glass_relief_horizontal": "玄武岩質ガラスの水平レリーフ", - "block.mineralogy.basaltic_glass_relief_i": "玄武岩質ガラス I レリーフ", - "block.mineralogy.basaltic_glass_relief_left": "玄武岩質ガラス左レリーフ", - "block.mineralogy.basaltic_glass_relief_pickaxe": "玄武岩質ガラスのつるはしレリーフ", - "block.mineralogy.basaltic_glass_relief_plus": "玄武岩質ガラス プラス レリーフ", - "block.mineralogy.basaltic_glass_relief_right": "玄武岩質ガラスの右レリーフ", - "block.mineralogy.basaltic_glass_relief_sword": "玄武岩質ガラスの剣のレリーフ", - "block.mineralogy.basaltic_glass_relief_vertical": "玄武岩質ガラスの垂直レリーフ", - "block.mineralogy.scoria_relief_axe": "スコリアアックス レリーフ", - "block.mineralogy.scoria_relief_blank": "スコリア ブランク レリーフ", - "block.mineralogy.scoria_relief_cross": "スコリアクロスレリーフ", - "block.mineralogy.scoria_relief_hammer": "スコリアハンマーレリーフ", - "block.mineralogy.scoria_relief_hoe": "スコリア・ホー・レリーフ", - "block.mineralogy.scoria_relief_horizontal": "スコリア水平レリーフ", - "block.mineralogy.scoria_relief_i": "スコリア I レリーフ", - "block.mineralogy.scoria_relief_left": "スコリア左レリーフ", - "block.mineralogy.scoria_relief_pickaxe": "スコリアのつるはしレリーフ", - "block.mineralogy.scoria_relief_plus": "スコリアプラスリリーフ", - "block.mineralogy.scoria_relief_right": "スコリア右レリーフ", - "block.mineralogy.scoria_relief_sword": "スコリア剣レリーフ", - "block.mineralogy.scoria_relief_vertical": "スコリア垂直レリーフ", - "block.mineralogy.tuff_relief_axe": "タフアックスのレリーフ", - "block.mineralogy.tuff_relief_blank": "タフブランクレリーフ", - "block.mineralogy.tuff_relief_cross": "タフクロスレリーフ", - "block.mineralogy.tuff_relief_hammer": "タフハンマーレリーフ", - "block.mineralogy.tuff_relief_hoe": "タフホーレリーフ", - "block.mineralogy.tuff_relief_horizontal": "凝灰岩の水平レリーフ", - "block.mineralogy.tuff_relief_i": "タフ I レリーフ", - "block.mineralogy.tuff_relief_left": "タフレフトレリーフ", - "block.mineralogy.tuff_relief_pickaxe": "凝灰岩のつるはしのレリーフ", - "block.mineralogy.tuff_relief_plus": "タフプラスリリーフ", - "block.mineralogy.tuff_relief_right": "タフライトレリーフ", - "block.mineralogy.tuff_relief_sword": "凝灰岩の剣のレリーフ", - "block.mineralogy.tuff_relief_vertical": "凝灰岩垂直レリーフ", - "block.mineralogy.siltstone_relief_axe": "シルトストーンの斧のレリーフ", - "block.mineralogy.siltstone_relief_blank": "シルトストーンのブランク レリーフ", - "block.mineralogy.siltstone_relief_cross": "シルトストーン クロス レリーフ", - "block.mineralogy.siltstone_relief_hammer": "シルトストーンハンマーレリーフ", - "block.mineralogy.siltstone_relief_hoe": "シルトストーンの鍬レリーフ", - "block.mineralogy.siltstone_relief_horizontal": "シルト岩の水平レリーフ", - "block.mineralogy.siltstone_relief_i": "シルトストーン I レリーフ", - "block.mineralogy.siltstone_relief_left": "シルトストーン左レリーフ", - "block.mineralogy.siltstone_relief_pickaxe": "シルトストーンのつるはしレリーフ", - "block.mineralogy.siltstone_relief_plus": "シルトストーン プラス レリーフ", - "block.mineralogy.siltstone_relief_right": "シルトストーンの右レリーフ", - "block.mineralogy.siltstone_relief_sword": "シルトストーンの剣のレリーフ", - "block.mineralogy.siltstone_relief_vertical": "シルト岩の垂直レリーフ", - "block.mineralogy.rock_salt_relief_axe": "岩塩斧レリーフ", - "block.mineralogy.rock_salt_relief_blank": "岩塩ブランクレリーフ", - "block.mineralogy.rock_salt_relief_cross": "岩塩クロスレリーフ", - "block.mineralogy.rock_salt_relief_hammer": "岩塩ハンマーレリーフ", - "block.mineralogy.rock_salt_relief_hoe": "岩塩鍬レリーフ", - "block.mineralogy.rock_salt_relief_horizontal": "岩塩横レリーフ", - "block.mineralogy.rock_salt_relief_i": "岩塩 I レリーフ", - "block.mineralogy.rock_salt_relief_left": "岩塩左レリーフ", - "block.mineralogy.rock_salt_relief_pickaxe": "岩塩のつるはしレリーフ", - "block.mineralogy.rock_salt_relief_plus": "岩塩プラスリリーフ", - "block.mineralogy.rock_salt_relief_right": "岩塩右救済", - "block.mineralogy.rock_salt_relief_sword": "岩塩剣レリーフ", - "block.mineralogy.rock_salt_relief_vertical": "岩塩縦レリーフ", - "block.mineralogy.hornfels_relief_axe": "ホルンフェルスの斧のレリーフ", - "block.mineralogy.hornfels_relief_blank": "ホルンフェルスのブランクレリーフ", - "block.mineralogy.hornfels_relief_cross": "ホルンフェルスクロスレリーフ", - "block.mineralogy.hornfels_relief_hammer": "ホルンフェルスハンマーレリーフ", - "block.mineralogy.hornfels_relief_hoe": "ホルンフェルスの鍬レリーフ", - "block.mineralogy.hornfels_relief_horizontal": "ホルンフェルスの水平レリーフ", - "block.mineralogy.hornfels_relief_i": "ホルンフェルス I レリーフ", - "block.mineralogy.hornfels_relief_left": "ホルンフェルスの左リリーフ", - "block.mineralogy.hornfels_relief_pickaxe": "ホルンフェルスのつるはしレリーフ", - "block.mineralogy.hornfels_relief_plus": "ホルンフェルスプラスレリーフ", - "block.mineralogy.hornfels_relief_right": "ホルンフェルスの右レリーフ", - "block.mineralogy.hornfels_relief_sword": "ホルンフェルス剣のレリーフ", - "block.mineralogy.hornfels_relief_vertical": "ホルンフェルスの垂直レリーフ", - "block.mineralogy.quartzite_relief_axe": "珪岩の斧のレリーフ", - "block.mineralogy.quartzite_relief_blank": "珪岩ブランクレリーフ", - "block.mineralogy.quartzite_relief_cross": "クォーツァイト クロス レリーフ", - "block.mineralogy.quartzite_relief_hammer": "珪岩ハンマーレリーフ", - "block.mineralogy.quartzite_relief_hoe": "珪岩の鍬レリーフ", - "block.mineralogy.quartzite_relief_horizontal": "珪岩の水平レリーフ", - "block.mineralogy.quartzite_relief_i": "クォーツァイト I レリーフ", - "block.mineralogy.quartzite_relief_left": "珪岩左レリーフ", - "block.mineralogy.quartzite_relief_pickaxe": "珪岩のつるはしレリーフ", - "block.mineralogy.quartzite_relief_plus": "クォーツァイト プラス レリーフ", - "block.mineralogy.quartzite_relief_right": "珪岩右レリーフ", - "block.mineralogy.quartzite_relief_sword": "珪岩剣レリーフ", - "block.mineralogy.quartzite_relief_vertical": "珪岩の垂直レリーフ", - "block.mineralogy.novaculite_relief_axe": "ノバキュライトアックスレリーフ", - "block.mineralogy.novaculite_relief_blank": "ノバキュライト ブランク レリーフ", - "block.mineralogy.novaculite_relief_cross": "ノバキュライト クロス レリーフ", - "block.mineralogy.novaculite_relief_hammer": "ノバキュライト ハンマー レリーフ", - "block.mineralogy.novaculite_relief_hoe": "ノバキュライト ホー レリーフ", - "block.mineralogy.novaculite_relief_horizontal": "ノバキュライトの水平レリーフ", - "block.mineralogy.novaculite_relief_i": "ノバキュライト I レリーフ", - "block.mineralogy.novaculite_relief_left": "ノバキュライト左レリーフ", - "block.mineralogy.novaculite_relief_pickaxe": "ノバキュライトのつるはしレリーフ", - "block.mineralogy.novaculite_relief_plus": "ノバキュライト プラス リリーフ", - "block.mineralogy.novaculite_relief_right": "ノバキュライト右レリーフ", - "block.mineralogy.novaculite_relief_sword": "ノバキュライトソードレリーフ", - "block.mineralogy.novaculite_relief_vertical": "ノバキュライト垂直レリーフ", - "advancements.mineralogy.all_the_rocks.title": "岩をルードと呼べ！", - "advancements.mineralogy.all_the_rocks.description": "わお、鉱物学の標準的な岩石のタイプをすべて見つけました!", - "fluid.mineralogy.crude_oil": "原油", - "block.mineralogy.crude_oil": "原油", - "item.mineralogy.crude_oil_bucket": "原油バケツ", + "block.mineralogy.rocksaltstreetlamp": "岩塩街灯", + "block.mineralogy.andesite_relief_axe": "安山岩のレリーフ（斧）", + "block.mineralogy.andesite_relief_blank": "安山岩のレリーフ（無地）", + "block.mineralogy.andesite_relief_cross": "安山岩のレリーフ（十字）", + "block.mineralogy.andesite_relief_hammer": "安山岩のレリーフ（ハンマー）", + "block.mineralogy.andesite_relief_hoe": "安山岩のレリーフ（クワ）", + "block.mineralogy.andesite_relief_horizontal": "安山岩のレリーフ（横）", + "block.mineralogy.andesite_relief_i": "安山岩のレリーフ（I）", + "block.mineralogy.andesite_relief_left": "安山岩のレリーフ（左）", + "block.mineralogy.andesite_relief_pickaxe": "安山岩のレリーフ（ツルハシ）", + "block.mineralogy.andesite_relief_plus": "安山岩のレリーフ（プラス記号）", + "block.mineralogy.andesite_relief_right": "安山岩のレリーフ（右）", + "block.mineralogy.andesite_relief_sword": "安山岩のレリーフ（剣）", + "block.mineralogy.andesite_relief_vertical": "安山岩のレリーフ（縦）", + "block.mineralogy.basalt_relief_axe": "玄武岩のレリーフ（斧）", + "block.mineralogy.basalt_relief_blank": "玄武岩のレリーフ（無地）", + "block.mineralogy.basalt_relief_cross": "玄武岩のレリーフ（十字）", + "block.mineralogy.basalt_relief_hammer": "玄武岩のレリーフ（ハンマー）", + "block.mineralogy.basalt_relief_hoe": "玄武岩のレリーフ（クワ）", + "block.mineralogy.basalt_relief_horizontal": "玄武岩のレリーフ（横）", + "block.mineralogy.basalt_relief_i": "玄武岩のレリーフ（I）", + "block.mineralogy.basalt_relief_left": "玄武岩のレリーフ（左）", + "block.mineralogy.basalt_relief_pickaxe": "玄武岩のレリーフ（ツルハシ）", + "block.mineralogy.basalt_relief_plus": "玄武岩のレリーフ（プラス記号）", + "block.mineralogy.basalt_relief_right": "玄武岩のレリーフ（右）", + "block.mineralogy.basalt_relief_sword": "玄武岩のレリーフ（剣）", + "block.mineralogy.basalt_relief_vertical": "玄武岩のレリーフ（縦）", + "block.mineralogy.diorite_relief_axe": "閃緑岩のレリーフ（斧）", + "block.mineralogy.diorite_relief_blank": "閃緑岩のレリーフ（無地）", + "block.mineralogy.diorite_relief_cross": "閃緑岩のレリーフ（十字）", + "block.mineralogy.diorite_relief_hammer": "閃緑岩のレリーフ（ハンマー）", + "block.mineralogy.diorite_relief_hoe": "閃緑岩のレリーフ（クワ）", + "block.mineralogy.diorite_relief_horizontal": "閃緑岩のレリーフ（横）", + "block.mineralogy.diorite_relief_i": "閃緑岩のレリーフ（I）", + "block.mineralogy.diorite_relief_left": "閃緑岩のレリーフ（左）", + "block.mineralogy.diorite_relief_pickaxe": "閃緑岩のレリーフ（ツルハシ）", + "block.mineralogy.diorite_relief_plus": "閃緑岩のレリーフ（プラス記号）", + "block.mineralogy.diorite_relief_right": "閃緑岩のレリーフ（右）", + "block.mineralogy.diorite_relief_sword": "閃緑岩のレリーフ（剣）", + "block.mineralogy.diorite_relief_vertical": "閃緑岩のレリーフ（縦）", + "block.mineralogy.granite_relief_axe": "花崗岩のレリーフ（斧）", + "block.mineralogy.granite_relief_blank": "花崗岩のレリーフ（無地）", + "block.mineralogy.granite_relief_cross": "花崗岩のレリーフ（十字）", + "block.mineralogy.granite_relief_hammer": "花崗岩のレリーフ（ハンマー）", + "block.mineralogy.granite_relief_hoe": "花崗岩のレリーフ（クワ）", + "block.mineralogy.granite_relief_horizontal": "花崗岩のレリーフ（横）", + "block.mineralogy.granite_relief_i": "花崗岩のレリーフ（I）", + "block.mineralogy.granite_relief_left": "花崗岩のレリーフ（左）", + "block.mineralogy.granite_relief_pickaxe": "花崗岩のレリーフ（ツルハシ）", + "block.mineralogy.granite_relief_plus": "花崗岩のレリーフ（プラス記号）", + "block.mineralogy.granite_relief_right": "花崗岩のレリーフ（右）", + "block.mineralogy.granite_relief_sword": "花崗岩のレリーフ（剣）", + "block.mineralogy.granite_relief_vertical": "花崗岩のレリーフ（縦）", + "block.mineralogy.rhyolite_relief_axe": "流紋岩のレリーフ（斧）", + "block.mineralogy.rhyolite_relief_blank": "流紋岩のレリーフ（無地）", + "block.mineralogy.rhyolite_relief_cross": "流紋岩のレリーフ（十字）", + "block.mineralogy.rhyolite_relief_hammer": "流紋岩のレリーフ（ハンマー）", + "block.mineralogy.rhyolite_relief_hoe": "流紋岩のレリーフ（クワ）", + "block.mineralogy.rhyolite_relief_horizontal": "流紋岩のレリーフ（横）", + "block.mineralogy.rhyolite_relief_i": "流紋岩のレリーフ（I）", + "block.mineralogy.rhyolite_relief_left": "流紋岩のレリーフ（左）", + "block.mineralogy.rhyolite_relief_pickaxe": "流紋岩のレリーフ（ツルハシ）", + "block.mineralogy.rhyolite_relief_plus": "流紋岩のレリーフ（プラス記号）", + "block.mineralogy.rhyolite_relief_right": "流紋岩のレリーフ（右）", + "block.mineralogy.rhyolite_relief_sword": "流紋岩のレリーフ（剣）", + "block.mineralogy.rhyolite_relief_vertical": "流紋岩のレリーフ（縦）", + "block.mineralogy.pegmatite_relief_axe": "ペグマタイトのレリーフ（斧）", + "block.mineralogy.pegmatite_relief_blank": "ペグマタイトのレリーフ（無地）", + "block.mineralogy.pegmatite_relief_cross": "ペグマタイトのレリーフ（十字）", + "block.mineralogy.pegmatite_relief_hammer": "ペグマタイトのレリーフ（ハンマー）", + "block.mineralogy.pegmatite_relief_hoe": "ペグマタイトのレリーフ（クワ）", + "block.mineralogy.pegmatite_relief_horizontal": "ペグマタイトのレリーフ（横）", + "block.mineralogy.pegmatite_relief_i": "ペグマタイトのレリーフ（I）", + "block.mineralogy.pegmatite_relief_left": "ペグマタイトのレリーフ（左）", + "block.mineralogy.pegmatite_relief_pickaxe": "ペグマタイトのレリーフ（ツルハシ）", + "block.mineralogy.pegmatite_relief_plus": "ペグマタイトのレリーフ（プラス記号）", + "block.mineralogy.pegmatite_relief_right": "ペグマタイトのレリーフ（右）", + "block.mineralogy.pegmatite_relief_sword": "ペグマタイトのレリーフ（剣）", + "block.mineralogy.pegmatite_relief_vertical": "ペグマタイトのレリーフ（縦）", + "block.mineralogy.shale_relief_axe": "頁岩のレリーフ（斧）", + "block.mineralogy.shale_relief_blank": "頁岩のレリーフ（無地）", + "block.mineralogy.shale_relief_cross": "頁岩のレリーフ（十字）", + "block.mineralogy.shale_relief_hammer": "頁岩のレリーフ（ハンマー）", + "block.mineralogy.shale_relief_hoe": "頁岩のレリーフ（クワ）", + "block.mineralogy.shale_relief_horizontal": "頁岩のレリーフ（横）", + "block.mineralogy.shale_relief_i": "頁岩のレリーフ（I）", + "block.mineralogy.shale_relief_left": "頁岩のレリーフ（左）", + "block.mineralogy.shale_relief_pickaxe": "頁岩のレリーフ（ツルハシ）", + "block.mineralogy.shale_relief_plus": "頁岩のレリーフ（プラス記号）", + "block.mineralogy.shale_relief_right": "頁岩のレリーフ（右）", + "block.mineralogy.shale_relief_sword": "頁岩のレリーフ（剣）", + "block.mineralogy.shale_relief_vertical": "頁岩のレリーフ（縦）", + "block.mineralogy.conglomerate_relief_axe": "礫岩のレリーフ（斧）", + "block.mineralogy.conglomerate_relief_blank": "礫岩のレリーフ（無地）", + "block.mineralogy.conglomerate_relief_cross": "礫岩のレリーフ（十字）", + "block.mineralogy.conglomerate_relief_hammer": "礫岩のレリーフ（ハンマー）", + "block.mineralogy.conglomerate_relief_hoe": "礫岩のレリーフ（クワ）", + "block.mineralogy.conglomerate_relief_horizontal": "礫岩のレリーフ（横）", + "block.mineralogy.conglomerate_relief_i": "礫岩のレリーフ（I）", + "block.mineralogy.conglomerate_relief_left": "礫岩のレリーフ（左）", + "block.mineralogy.conglomerate_relief_pickaxe": "礫岩のレリーフ（ツルハシ）", + "block.mineralogy.conglomerate_relief_plus": "礫岩のレリーフ（プラス記号）", + "block.mineralogy.conglomerate_relief_right": "礫岩のレリーフ（右）", + "block.mineralogy.conglomerate_relief_sword": "礫岩のレリーフ（剣）", + "block.mineralogy.conglomerate_relief_vertical": "礫岩のレリーフ（縦）", + "block.mineralogy.dolomite_relief_axe": "苦灰岩のレリーフ（斧）", + "block.mineralogy.dolomite_relief_blank": "苦灰岩のレリーフ（無地）", + "block.mineralogy.dolomite_relief_cross": "苦灰岩のレリーフ（十字）", + "block.mineralogy.dolomite_relief_hammer": "苦灰岩のレリーフ（ハンマー）", + "block.mineralogy.dolomite_relief_hoe": "苦灰岩のレリーフ（クワ）", + "block.mineralogy.dolomite_relief_horizontal": "苦灰岩のレリーフ（横）", + "block.mineralogy.dolomite_relief_i": "苦灰岩のレリーフ（I）", + "block.mineralogy.dolomite_relief_left": "苦灰岩のレリーフ（左）", + "block.mineralogy.dolomite_relief_pickaxe": "苦灰岩のレリーフ（ツルハシ）", + "block.mineralogy.dolomite_relief_plus": "苦灰岩のレリーフ（プラス記号）", + "block.mineralogy.dolomite_relief_right": "苦灰岩のレリーフ（右）", + "block.mineralogy.dolomite_relief_sword": "苦灰岩のレリーフ（剣）", + "block.mineralogy.dolomite_relief_vertical": "苦灰岩のレリーフ（縦）", + "block.mineralogy.limestone_relief_axe": "石灰岩のレリーフ（斧）", + "block.mineralogy.limestone_relief_blank": "石灰岩のレリーフ（無地）", + "block.mineralogy.limestone_relief_cross": "石灰岩のレリーフ（十字）", + "block.mineralogy.limestone_relief_hammer": "石灰岩のレリーフ（ハンマー）", + "block.mineralogy.limestone_relief_hoe": "石灰岩のレリーフ（クワ）", + "block.mineralogy.limestone_relief_horizontal": "石灰岩のレリーフ（横）", + "block.mineralogy.limestone_relief_i": "石灰岩のレリーフ（I）", + "block.mineralogy.limestone_relief_left": "石灰岩のレリーフ（左）", + "block.mineralogy.limestone_relief_pickaxe": "石灰岩のレリーフ（ツルハシ）", + "block.mineralogy.limestone_relief_plus": "石灰岩のレリーフ（プラス記号）", + "block.mineralogy.limestone_relief_right": "石灰岩のレリーフ（右）", + "block.mineralogy.limestone_relief_sword": "石灰岩のレリーフ（剣）", + "block.mineralogy.limestone_relief_vertical": "石灰岩のレリーフ（縦）", + "block.mineralogy.marble_relief_axe": "大理石のレリーフ（斧）", + "block.mineralogy.marble_relief_blank": "大理石のレリーフ（無地）", + "block.mineralogy.marble_relief_cross": "大理石のレリーフ（十字）", + "block.mineralogy.marble_relief_hammer": "大理石のレリーフ（ハンマー）", + "block.mineralogy.marble_relief_hoe": "大理石のレリーフ（クワ）", + "block.mineralogy.marble_relief_horizontal": "大理石のレリーフ（横）", + "block.mineralogy.marble_relief_i": "大理石のレリーフ（I）", + "block.mineralogy.marble_relief_left": "大理石のレリーフ（左）", + "block.mineralogy.marble_relief_pickaxe": "大理石のレリーフ（ツルハシ）", + "block.mineralogy.marble_relief_plus": "大理石のレリーフ（プラス記号）", + "block.mineralogy.marble_relief_right": "大理石のレリーフ（右）", + "block.mineralogy.marble_relief_sword": "大理石のレリーフ（剣）", + "block.mineralogy.marble_relief_vertical": "大理石のレリーフ（縦）", + "block.mineralogy.slate_relief_axe": "粘板岩のレリーフ（斧）", + "block.mineralogy.slate_relief_blank": "粘板岩のレリーフ（無地）", + "block.mineralogy.slate_relief_cross": "粘板岩のレリーフ（十字）", + "block.mineralogy.slate_relief_hammer": "粘板岩のレリーフ（ハンマー）", + "block.mineralogy.slate_relief_hoe": "粘板岩のレリーフ（クワ）", + "block.mineralogy.slate_relief_horizontal": "粘板岩のレリーフ（横）", + "block.mineralogy.slate_relief_i": "粘板岩のレリーフ（I）", + "block.mineralogy.slate_relief_left": "粘板岩のレリーフ（左）", + "block.mineralogy.slate_relief_pickaxe": "粘板岩のレリーフ（ツルハシ）", + "block.mineralogy.slate_relief_plus": "粘板岩のレリーフ（プラス記号）", + "block.mineralogy.slate_relief_right": "粘板岩のレリーフ（右）", + "block.mineralogy.slate_relief_sword": "粘板岩のレリーフ（剣）", + "block.mineralogy.slate_relief_vertical": "粘板岩のレリーフ（縦）", + "block.mineralogy.schist_relief_axe": "結晶片岩のレリーフ（斧）", + "block.mineralogy.schist_relief_blank": "結晶片岩のレリーフ（無地）", + "block.mineralogy.schist_relief_cross": "結晶片岩のレリーフ（十字）", + "block.mineralogy.schist_relief_hammer": "結晶片岩のレリーフ（ハンマー）", + "block.mineralogy.schist_relief_hoe": "結晶片岩のレリーフ（クワ）", + "block.mineralogy.schist_relief_horizontal": "結晶片岩のレリーフ（横）", + "block.mineralogy.schist_relief_i": "結晶片岩のレリーフ（I）", + "block.mineralogy.schist_relief_left": "結晶片岩のレリーフ（左）", + "block.mineralogy.schist_relief_pickaxe": "結晶片岩のレリーフ（ツルハシ）", + "block.mineralogy.schist_relief_plus": "結晶片岩のレリーフ（プラス記号）", + "block.mineralogy.schist_relief_right": "結晶片岩のレリーフ（右）", + "block.mineralogy.schist_relief_sword": "結晶片岩のレリーフ（剣）", + "block.mineralogy.schist_relief_vertical": "結晶片岩のレリーフ（縦）", + "block.mineralogy.gneiss_relief_axe": "片麻岩のレリーフ（斧）", + "block.mineralogy.gneiss_relief_blank": "片麻岩のレリーフ（無地）", + "block.mineralogy.gneiss_relief_cross": "片麻岩のレリーフ（十字）", + "block.mineralogy.gneiss_relief_hammer": "片麻岩のレリーフ（ハンマー）", + "block.mineralogy.gneiss_relief_hoe": "片麻岩のレリーフ（クワ）", + "block.mineralogy.gneiss_relief_horizontal": "片麻岩のレリーフ（横）", + "block.mineralogy.gneiss_relief_i": "片麻岩のレリーフ（I）", + "block.mineralogy.gneiss_relief_left": "片麻岩のレリーフ（左）", + "block.mineralogy.gneiss_relief_pickaxe": "片麻岩のレリーフ（ツルハシ）", + "block.mineralogy.gneiss_relief_plus": "片麻岩のレリーフ（プラス記号）", + "block.mineralogy.gneiss_relief_right": "片麻岩のレリーフ（右）", + "block.mineralogy.gneiss_relief_sword": "片麻岩のレリーフ（剣）", + "block.mineralogy.gneiss_relief_vertical": "片麻岩のレリーフ（縦）", + "block.mineralogy.phyllite_relief_axe": "千枚岩のレリーフ（斧）", + "block.mineralogy.phyllite_relief_blank": "千枚岩のレリーフ（無地）", + "block.mineralogy.phyllite_relief_cross": "千枚岩のレリーフ（十字）", + "block.mineralogy.phyllite_relief_hammer": "千枚岩のレリーフ（ハンマー）", + "block.mineralogy.phyllite_relief_hoe": "千枚岩のレリーフ（クワ）", + "block.mineralogy.phyllite_relief_horizontal": "千枚岩のレリーフ（横）", + "block.mineralogy.phyllite_relief_i": "千枚岩のレリーフ（I）", + "block.mineralogy.phyllite_relief_left": "千枚岩のレリーフ（左）", + "block.mineralogy.phyllite_relief_pickaxe": "千枚岩のレリーフ（ツルハシ）", + "block.mineralogy.phyllite_relief_plus": "千枚岩のレリーフ（プラス記号）", + "block.mineralogy.phyllite_relief_right": "千枚岩のレリーフ（右）", + "block.mineralogy.phyllite_relief_sword": "千枚岩のレリーフ（剣）", + "block.mineralogy.phyllite_relief_vertical": "千枚岩のレリーフ（縦）", + "block.mineralogy.amphibolite_relief_axe": "角閃岩のレリーフ（斧）", + "block.mineralogy.amphibolite_relief_blank": "角閃岩のレリーフ（無地）", + "block.mineralogy.amphibolite_relief_cross": "角閃岩のレリーフ（十字）", + "block.mineralogy.amphibolite_relief_hammer": "角閃岩のレリーフ（ハンマー）", + "block.mineralogy.amphibolite_relief_hoe": "角閃岩のレリーフ（クワ）", + "block.mineralogy.amphibolite_relief_horizontal": "角閃岩のレリーフ（横）", + "block.mineralogy.amphibolite_relief_i": "角閃岩のレリーフ（I）", + "block.mineralogy.amphibolite_relief_left": "角閃岩のレリーフ（左）", + "block.mineralogy.amphibolite_relief_pickaxe": "角閃岩のレリーフ（ツルハシ）", + "block.mineralogy.amphibolite_relief_plus": "角閃岩のレリーフ（プラス記号）", + "block.mineralogy.amphibolite_relief_right": "角閃岩のレリーフ（右）", + "block.mineralogy.amphibolite_relief_sword": "角閃岩のレリーフ（剣）", + "block.mineralogy.amphibolite_relief_vertical": "角閃岩のレリーフ（縦）", + "block.mineralogy.diabase_relief_axe": "輝緑岩のレリーフ（斧）", + "block.mineralogy.diabase_relief_blank": "輝緑岩のレリーフ（無地）", + "block.mineralogy.diabase_relief_cross": "輝緑岩のレリーフ（十字）", + "block.mineralogy.diabase_relief_hammer": "輝緑岩のレリーフ（ハンマー）", + "block.mineralogy.diabase_relief_hoe": "輝緑岩のレリーフ（クワ）", + "block.mineralogy.diabase_relief_horizontal": "輝緑岩のレリーフ（横）", + "block.mineralogy.diabase_relief_i": "輝緑岩のレリーフ（I）", + "block.mineralogy.diabase_relief_left": "輝緑岩のレリーフ（左）", + "block.mineralogy.diabase_relief_pickaxe": "輝緑岩のレリーフ（ツルハシ）", + "block.mineralogy.diabase_relief_plus": "輝緑岩のレリーフ（プラス記号）", + "block.mineralogy.diabase_relief_right": "輝緑岩のレリーフ（右）", + "block.mineralogy.diabase_relief_sword": "輝緑岩のレリーフ（剣）", + "block.mineralogy.diabase_relief_vertical": "輝緑岩のレリーフ（縦）", + "block.mineralogy.gabbro_relief_axe": "はんれい岩のレリーフ（斧）", + "block.mineralogy.gabbro_relief_blank": "はんれい岩のレリーフ（無地）", + "block.mineralogy.gabbro_relief_cross": "はんれい岩のレリーフ（十字）", + "block.mineralogy.gabbro_relief_hammer": "はんれい岩のレリーフ（ハンマー）", + "block.mineralogy.gabbro_relief_hoe": "はんれい岩のレリーフ（クワ）", + "block.mineralogy.gabbro_relief_horizontal": "はんれい岩のレリーフ（横）", + "block.mineralogy.gabbro_relief_i": "はんれい岩のレリーフ（I）", + "block.mineralogy.gabbro_relief_left": "はんれい岩のレリーフ（左）", + "block.mineralogy.gabbro_relief_pickaxe": "はんれい岩のレリーフ（ツルハシ）", + "block.mineralogy.gabbro_relief_plus": "はんれい岩のレリーフ（プラス記号）", + "block.mineralogy.gabbro_relief_right": "はんれい岩のレリーフ（右）", + "block.mineralogy.gabbro_relief_sword": "はんれい岩のレリーフ（剣）", + "block.mineralogy.gabbro_relief_vertical": "はんれい岩のレリーフ（縦）", + "block.mineralogy.peridotite_relief_axe": "かんらん岩のレリーフ（斧）", + "block.mineralogy.peridotite_relief_blank": "かんらん岩のレリーフ（無地）", + "block.mineralogy.peridotite_relief_cross": "かんらん岩のレリーフ（十字）", + "block.mineralogy.peridotite_relief_hammer": "かんらん岩のレリーフ（ハンマー）", + "block.mineralogy.peridotite_relief_hoe": "かんらん岩のレリーフ（クワ）", + "block.mineralogy.peridotite_relief_horizontal": "かんらん岩のレリーフ（横）", + "block.mineralogy.peridotite_relief_i": "かんらん岩のレリーフ（I）", + "block.mineralogy.peridotite_relief_left": "かんらん岩のレリーフ（左）", + "block.mineralogy.peridotite_relief_pickaxe": "かんらん岩のレリーフ（ツルハシ）", + "block.mineralogy.peridotite_relief_plus": "かんらん岩のレリーフ（プラス記号）", + "block.mineralogy.peridotite_relief_right": "かんらん岩のレリーフ（右）", + "block.mineralogy.peridotite_relief_sword": "かんらん岩のレリーフ（剣）", + "block.mineralogy.peridotite_relief_vertical": "かんらん岩のレリーフ（縦）", + "block.mineralogy.basaltic_glass_relief_axe": "玄武岩質ガラスのレリーフ（斧）", + "block.mineralogy.basaltic_glass_relief_blank": "玄武岩質ガラスのレリーフ（無地）", + "block.mineralogy.basaltic_glass_relief_cross": "玄武岩質ガラスのレリーフ（十字）", + "block.mineralogy.basaltic_glass_relief_hammer": "玄武岩質ガラスのレリーフ（ハンマー）", + "block.mineralogy.basaltic_glass_relief_hoe": "玄武岩質ガラスのレリーフ（クワ）", + "block.mineralogy.basaltic_glass_relief_horizontal": "玄武岩質ガラスのレリーフ（横）", + "block.mineralogy.basaltic_glass_relief_i": "玄武岩質ガラスのレリーフ（I）", + "block.mineralogy.basaltic_glass_relief_left": "玄武岩質ガラスのレリーフ（左）", + "block.mineralogy.basaltic_glass_relief_pickaxe": "玄武岩質ガラスのレリーフ（ツルハシ）", + "block.mineralogy.basaltic_glass_relief_plus": "玄武岩質ガラスのレリーフ（プラス記号）", + "block.mineralogy.basaltic_glass_relief_right": "玄武岩質ガラスのレリーフ（右）", + "block.mineralogy.basaltic_glass_relief_sword": "玄武岩質ガラスのレリーフ（剣）", + "block.mineralogy.basaltic_glass_relief_vertical": "玄武岩質ガラスのレリーフ（縦）", + "block.mineralogy.scoria_relief_axe": "スコリアのレリーフ（斧）", + "block.mineralogy.scoria_relief_blank": "スコリアのレリーフ（無地）", + "block.mineralogy.scoria_relief_cross": "スコリアのレリーフ（十字）", + "block.mineralogy.scoria_relief_hammer": "スコリアのレリーフ（ハンマー）", + "block.mineralogy.scoria_relief_hoe": "スコリアのレリーフ（クワ）", + "block.mineralogy.scoria_relief_horizontal": "スコリアのレリーフ（横）", + "block.mineralogy.scoria_relief_i": "スコリアのレリーフ（I）", + "block.mineralogy.scoria_relief_left": "スコリアのレリーフ（左）", + "block.mineralogy.scoria_relief_pickaxe": "スコリアのレリーフ（ツルハシ）", + "block.mineralogy.scoria_relief_plus": "スコリアのレリーフ（プラス記号）", + "block.mineralogy.scoria_relief_right": "スコリアのレリーフ（右）", + "block.mineralogy.scoria_relief_sword": "スコリアのレリーフ（剣）", + "block.mineralogy.scoria_relief_vertical": "スコリアのレリーフ（縦）", + "block.mineralogy.tuff_relief_axe": "凝灰岩のレリーフ（斧）", + "block.mineralogy.tuff_relief_blank": "凝灰岩のレリーフ（無地）", + "block.mineralogy.tuff_relief_cross": "凝灰岩のレリーフ（十字）", + "block.mineralogy.tuff_relief_hammer": "凝灰岩のレリーフ（ハンマー）", + "block.mineralogy.tuff_relief_hoe": "凝灰岩のレリーフ（クワ）", + "block.mineralogy.tuff_relief_horizontal": "凝灰岩のレリーフ（横）", + "block.mineralogy.tuff_relief_i": "凝灰岩のレリーフ（I）", + "block.mineralogy.tuff_relief_left": "凝灰岩のレリーフ（左）", + "block.mineralogy.tuff_relief_pickaxe": "凝灰岩のレリーフ（ツルハシ）", + "block.mineralogy.tuff_relief_plus": "凝灰岩のレリーフ（プラス記号）", + "block.mineralogy.tuff_relief_right": "凝灰岩のレリーフ（右）", + "block.mineralogy.tuff_relief_sword": "凝灰岩のレリーフ（剣）", + "block.mineralogy.tuff_relief_vertical": "凝灰岩のレリーフ（縦）", + "block.mineralogy.siltstone_relief_axe": "シルト岩のレリーフ（斧）", + "block.mineralogy.siltstone_relief_blank": "シルト岩のレリーフ（無地）", + "block.mineralogy.siltstone_relief_cross": "シルト岩のレリーフ（十字）", + "block.mineralogy.siltstone_relief_hammer": "シルト岩のレリーフ（ハンマー）", + "block.mineralogy.siltstone_relief_hoe": "シルト岩のレリーフ（クワ）", + "block.mineralogy.siltstone_relief_horizontal": "シルト岩のレリーフ（横）", + "block.mineralogy.siltstone_relief_i": "シルト岩のレリーフ（I）", + "block.mineralogy.siltstone_relief_left": "シルト岩のレリーフ（左）", + "block.mineralogy.siltstone_relief_pickaxe": "シルト岩のレリーフ（ツルハシ）", + "block.mineralogy.siltstone_relief_plus": "シルト岩のレリーフ（プラス記号）", + "block.mineralogy.siltstone_relief_right": "シルト岩のレリーフ（右）", + "block.mineralogy.siltstone_relief_sword": "シルト岩のレリーフ（剣）", + "block.mineralogy.siltstone_relief_vertical": "シルト岩のレリーフ（縦）", + "block.mineralogy.rock_salt_relief_axe": "岩塩のレリーフ（斧）", + "block.mineralogy.rock_salt_relief_blank": "岩塩のレリーフ（無地）", + "block.mineralogy.rock_salt_relief_cross": "岩塩のレリーフ（十字）", + "block.mineralogy.rock_salt_relief_hammer": "岩塩のレリーフ（ハンマー）", + "block.mineralogy.rock_salt_relief_hoe": "岩塩のレリーフ（クワ）", + "block.mineralogy.rock_salt_relief_horizontal": "岩塩のレリーフ（横）", + "block.mineralogy.rock_salt_relief_i": "岩塩のレリーフ（I）", + "block.mineralogy.rock_salt_relief_left": "岩塩のレリーフ（左）", + "block.mineralogy.rock_salt_relief_pickaxe": "岩塩のレリーフ（ツルハシ）", + "block.mineralogy.rock_salt_relief_plus": "岩塩のレリーフ（プラス記号）", + "block.mineralogy.rock_salt_relief_right": "岩塩のレリーフ（右）", + "block.mineralogy.rock_salt_relief_sword": "岩塩のレリーフ（剣）", + "block.mineralogy.rock_salt_relief_vertical": "岩塩のレリーフ（縦）", + "block.mineralogy.hornfels_relief_axe": "ホルンフェルスのレリーフ（斧）", + "block.mineralogy.hornfels_relief_blank": "ホルンフェルスのレリーフ（無地）", + "block.mineralogy.hornfels_relief_cross": "ホルンフェルスのレリーフ（十字）", + "block.mineralogy.hornfels_relief_hammer": "ホルンフェルスのレリーフ（ハンマー）", + "block.mineralogy.hornfels_relief_hoe": "ホルンフェルスのレリーフ（クワ）", + "block.mineralogy.hornfels_relief_horizontal": "ホルンフェルスのレリーフ（横）", + "block.mineralogy.hornfels_relief_i": "ホルンフェルスのレリーフ（I）", + "block.mineralogy.hornfels_relief_left": "ホルンフェルスのレリーフ（左）", + "block.mineralogy.hornfels_relief_pickaxe": "ホルンフェルスのレリーフ（ツルハシ）", + "block.mineralogy.hornfels_relief_plus": "ホルンフェルスのレリーフ（プラス記号）", + "block.mineralogy.hornfels_relief_right": "ホルンフェルスのレリーフ（右）", + "block.mineralogy.hornfels_relief_sword": "ホルンフェルスのレリーフ（剣）", + "block.mineralogy.hornfels_relief_vertical": "ホルンフェルスのレリーフ（縦）", + "block.mineralogy.quartzite_relief_axe": "石英岩のレリーフ（斧）", + "block.mineralogy.quartzite_relief_blank": "石英岩のレリーフ（無地）", + "block.mineralogy.quartzite_relief_cross": "石英岩のレリーフ（十字）", + "block.mineralogy.quartzite_relief_hammer": "石英岩のレリーフ（ハンマー）", + "block.mineralogy.quartzite_relief_hoe": "石英岩のレリーフ（クワ）", + "block.mineralogy.quartzite_relief_horizontal": "石英岩のレリーフ（横）", + "block.mineralogy.quartzite_relief_i": "石英岩のレリーフ（I）", + "block.mineralogy.quartzite_relief_left": "石英岩のレリーフ（左）", + "block.mineralogy.quartzite_relief_pickaxe": "石英岩のレリーフ（ツルハシ）", + "block.mineralogy.quartzite_relief_plus": "石英岩のレリーフ（プラス記号）", + "block.mineralogy.quartzite_relief_right": "石英岩のレリーフ（右）", + "block.mineralogy.quartzite_relief_sword": "石英岩のレリーフ（剣）", + "block.mineralogy.quartzite_relief_vertical": "石英岩のレリーフ（縦）", + "block.mineralogy.novaculite_relief_axe": "ノバキュライトのレリーフ（斧）", + "block.mineralogy.novaculite_relief_blank": "ノバキュライトのレリーフ（無地）", + "block.mineralogy.novaculite_relief_cross": "ノバキュライトのレリーフ（十字）", + "block.mineralogy.novaculite_relief_hammer": "ノバキュライトのレリーフ（ハンマー）", + "block.mineralogy.novaculite_relief_hoe": "ノバキュライトのレリーフ（クワ）", + "block.mineralogy.novaculite_relief_horizontal": "ノバキュライトのレリーフ（横）", + "block.mineralogy.novaculite_relief_i": "ノバキュライトのレリーフ（I）", + "block.mineralogy.novaculite_relief_left": "ノバキュライトのレリーフ（左）", + "block.mineralogy.novaculite_relief_pickaxe": "ノバキュライトのレリーフ（ツルハシ）", + "block.mineralogy.novaculite_relief_plus": "ノバキュライトのレリーフ（プラス記号）", + "block.mineralogy.novaculite_relief_right": "ノバキュライトのレリーフ（右）", + "block.mineralogy.novaculite_relief_sword": "ノバキュライトのレリーフ（剣）", + "block.mineralogy.novaculite_relief_vertical": "ノバキュライトのレリーフ（縦）", "itemGroup.mineralogy.mineralogy": "鉱物学", - "itemGroup.mineralogy.rock": "鉱物岩石", + "itemGroup.mineralogy.rock": "鉱物学の岩石", "itemGroup.mineralogy.stair": "鉱物学の階段", - "itemGroup.mineralogy.slab": "鉱物学スラブ", - "itemGroup.mineralogy.wall": "鉱物学の壁", - "itemGroup.mineralogy.item": "鉱物学アイテム" + "itemGroup.mineralogy.slab": "鉱物学のハーフブロック", + "itemGroup.mineralogy.wall": "鉱物学の塀", + "itemGroup.mineralogy.item": "鉱物学のアイテム", + "block.mineralogy.crude_oil": "原油", + "item.mineralogy.crude_oil_bucket": "原油入りバケツ", + "fluid.mineralogy.crude_oil": "原油", + "advancements.mineralogy.all_the_rocks.title": "すべての岩石", + "advancements.mineralogy.all_the_rocks.description": "鉱物学の標準的な岩石をすべて見つけました！" } diff --git a/src/main/resources/assets/mineralogy/lang/ko_kr.json b/src/main/resources/assets/mineralogy/lang/ko_kr.json index df47e57aa..5dfecde9c 100644 --- a/src/main/resources/assets/mineralogy/lang/ko_kr.json +++ b/src/main/resources/assets/mineralogy/lang/ko_kr.json @@ -1,940 +1,940 @@ { "block.mineralogy.andesite": "안산암", "block.mineralogy.andesite_stairs": "안산암 계단", - "block.mineralogy.andesite_slab": "안산암 석판", + "block.mineralogy.andesite_slab": "안산암 반 블록", "block.mineralogy.andesite_brick": "안산암 벽돌", "block.mineralogy.andesite_brick_stairs": "안산암 벽돌 계단", - "block.mineralogy.andesite_brick_slab": "안산암 벽돌 슬라브", - "block.mineralogy.andesite_smooth": "연마된 안산암", - "block.mineralogy.andesite_smooth_stairs": "안산암 광택 계단", - "block.mineralogy.andesite_smooth_slab": "안산암 광택 슬래브", - "block.mineralogy.andesite_smooth_brick": "안산암 광택 벽돌", - "block.mineralogy.andesite_smooth_brick_stairs": "안산암 광택 벽돌 계단", - "block.mineralogy.andesite_smooth_brick_slab": "안산암 광택 벽돌 슬래브", + "block.mineralogy.andesite_brick_slab": "안산암 벽돌 반 블록", + "block.mineralogy.andesite_smooth": "윤나는 안산암", + "block.mineralogy.andesite_smooth_stairs": "윤나는 안산암 계단", + "block.mineralogy.andesite_smooth_slab": "윤나는 안산암 반 블록", + "block.mineralogy.andesite_smooth_brick": "윤나는 안산암 벽돌", + "block.mineralogy.andesite_smooth_brick_stairs": "윤나는 안산암 벽돌 계단", + "block.mineralogy.andesite_smooth_brick_slab": "윤나는 안산암 벽돌 반 블록", "block.mineralogy.basalt": "현무암", "block.mineralogy.basalt_stairs": "현무암 계단", - "block.mineralogy.basalt_slab": "현무암 석판", + "block.mineralogy.basalt_slab": "현무암 반 블록", "block.mineralogy.basalt_brick": "현무암 벽돌", "block.mineralogy.basalt_brick_stairs": "현무암 벽돌 계단", - "block.mineralogy.basalt_brick_slab": "현무암 벽돌 슬라브", - "block.mineralogy.basalt_smooth": "연마된 현무암", - "block.mineralogy.basalt_smooth_stairs": "현무암 광택 계단", - "block.mineralogy.basalt_smooth_slab": "현무암 광택 슬래브", - "block.mineralogy.basalt_smooth_brick": "현무암 광택 벽돌", - "block.mineralogy.basalt_smooth_brick_stairs": "현무암 광택 벽돌 계단", - "block.mineralogy.basalt_smooth_brick_slab": "현무암 광택 벽돌 슬래브", + "block.mineralogy.basalt_brick_slab": "현무암 벽돌 반 블록", + "block.mineralogy.basalt_smooth": "윤나는 현무암", + "block.mineralogy.basalt_smooth_stairs": "윤나는 현무암 계단", + "block.mineralogy.basalt_smooth_slab": "윤나는 현무암 반 블록", + "block.mineralogy.basalt_smooth_brick": "윤나는 현무암 벽돌", + "block.mineralogy.basalt_smooth_brick_stairs": "윤나는 현무암 벽돌 계단", + "block.mineralogy.basalt_smooth_brick_slab": "윤나는 현무암 벽돌 반 블록", "block.mineralogy.diorite": "섬록암", "block.mineralogy.diorite_stairs": "섬록암 계단", - "block.mineralogy.diorite_slab": "섬록암 석판", + "block.mineralogy.diorite_slab": "섬록암 반 블록", "block.mineralogy.diorite_brick": "섬록암 벽돌", "block.mineralogy.diorite_brick_stairs": "섬록암 벽돌 계단", - "block.mineralogy.diorite_brick_slab": "섬록암 벽돌 슬라브", - "block.mineralogy.diorite_smooth": "연마된 섬록암", - "block.mineralogy.diorite_smooth_stairs": "섬록암 광택 계단", - "block.mineralogy.diorite_smooth_slab": "섬록암 연마 슬라브", - "block.mineralogy.diorite_smooth_brick": "섬록암 광택 벽돌", - "block.mineralogy.diorite_smooth_brick_stairs": "섬록암 광택 벽돌 계단", - "block.mineralogy.diorite_smooth_brick_slab": "섬록암 광택 벽돌 슬라브", + "block.mineralogy.diorite_brick_slab": "섬록암 벽돌 반 블록", + "block.mineralogy.diorite_smooth": "윤나는 섬록암", + "block.mineralogy.diorite_smooth_stairs": "윤나는 섬록암 계단", + "block.mineralogy.diorite_smooth_slab": "윤나는 섬록암 반 블록", + "block.mineralogy.diorite_smooth_brick": "윤나는 섬록암 벽돌", + "block.mineralogy.diorite_smooth_brick_stairs": "윤나는 섬록암 벽돌 계단", + "block.mineralogy.diorite_smooth_brick_slab": "윤나는 섬록암 벽돌 반 블록", "block.mineralogy.granite": "화강암", "block.mineralogy.granite_stairs": "화강암 계단", - "block.mineralogy.granite_slab": "화강암 석판", + "block.mineralogy.granite_slab": "화강암 반 블록", "block.mineralogy.granite_brick": "화강암 벽돌", "block.mineralogy.granite_brick_stairs": "화강암 벽돌 계단", - "block.mineralogy.granite_brick_slab": "화강암 벽돌 슬라브", - "block.mineralogy.granite_smooth": "연마된 화강암", - "block.mineralogy.granite_smooth_stairs": "화강암 광택 계단", - "block.mineralogy.granite_smooth_slab": "화강암 광택 슬래브", - "block.mineralogy.granite_smooth_brick": "화강암 광택 벽돌", - "block.mineralogy.granite_smooth_brick_stairs": "화강암 광택 벽돌 계단", - "block.mineralogy.granite_smooth_brick_slab": "화강암 광택 벽돌 슬라브", + "block.mineralogy.granite_brick_slab": "화강암 벽돌 반 블록", + "block.mineralogy.granite_smooth": "윤나는 화강암", + "block.mineralogy.granite_smooth_stairs": "윤나는 화강암 계단", + "block.mineralogy.granite_smooth_slab": "윤나는 화강암 반 블록", + "block.mineralogy.granite_smooth_brick": "윤나는 화강암 벽돌", + "block.mineralogy.granite_smooth_brick_stairs": "윤나는 화강암 벽돌 계단", + "block.mineralogy.granite_smooth_brick_slab": "윤나는 화강암 벽돌 반 블록", "block.mineralogy.rhyolite": "유문암", "block.mineralogy.rhyolite_stairs": "유문암 계단", - "block.mineralogy.rhyolite_slab": "유문암 석판", + "block.mineralogy.rhyolite_slab": "유문암 반 블록", "block.mineralogy.rhyolite_brick": "유문암 벽돌", "block.mineralogy.rhyolite_brick_stairs": "유문암 벽돌 계단", - "block.mineralogy.rhyolite_brick_slab": "유문암 벽돌 슬라브", - "block.mineralogy.rhyolite_smooth": "광택나는 유문암", - "block.mineralogy.rhyolite_smooth_stairs": "유문암 광택 계단", - "block.mineralogy.rhyolite_smooth_slab": "유문암 광택 슬래브", - "block.mineralogy.rhyolite_smooth_brick": "유문암 광택 벽돌", - "block.mineralogy.rhyolite_smooth_brick_stairs": "유문암 광택 벽돌 계단", - "block.mineralogy.rhyolite_smooth_brick_slab": "유문암 광택 벽돌 슬래브", + "block.mineralogy.rhyolite_brick_slab": "유문암 벽돌 반 블록", + "block.mineralogy.rhyolite_smooth": "윤나는 유문암", + "block.mineralogy.rhyolite_smooth_stairs": "윤나는 유문암 계단", + "block.mineralogy.rhyolite_smooth_slab": "윤나는 유문암 반 블록", + "block.mineralogy.rhyolite_smooth_brick": "윤나는 유문암 벽돌", + "block.mineralogy.rhyolite_smooth_brick_stairs": "윤나는 유문암 벽돌 계단", + "block.mineralogy.rhyolite_smooth_brick_slab": "윤나는 유문암 벽돌 반 블록", "block.mineralogy.pegmatite": "페그마타이트", "block.mineralogy.pegmatite_stairs": "페그마타이트 계단", - "block.mineralogy.pegmatite_slab": "페그마타이트 석판", + "block.mineralogy.pegmatite_slab": "페그마타이트 반 블록", "block.mineralogy.pegmatite_brick": "페그마타이트 벽돌", "block.mineralogy.pegmatite_brick_stairs": "페그마타이트 벽돌 계단", - "block.mineralogy.pegmatite_brick_slab": "페그마타이트 벽돌 슬라브", - "block.mineralogy.pegmatite_smooth": "연마된 페그마타이트", - "block.mineralogy.pegmatite_smooth_stairs": "페그마타이트 광택 계단", - "block.mineralogy.pegmatite_smooth_slab": "페그마타이트 광택 슬래브", - "block.mineralogy.pegmatite_smooth_brick": "페그마타이트 광택 벽돌", - "block.mineralogy.pegmatite_smooth_brick_stairs": "페그마타이트 광택 벽돌 계단", - "block.mineralogy.pegmatite_smooth_brick_slab": "페그마타이트 광택 벽돌 슬래브", + "block.mineralogy.pegmatite_brick_slab": "페그마타이트 벽돌 반 블록", + "block.mineralogy.pegmatite_smooth": "윤나는 페그마타이트", + "block.mineralogy.pegmatite_smooth_stairs": "윤나는 페그마타이트 계단", + "block.mineralogy.pegmatite_smooth_slab": "윤나는 페그마타이트 반 블록", + "block.mineralogy.pegmatite_smooth_brick": "윤나는 페그마타이트 벽돌", + "block.mineralogy.pegmatite_smooth_brick_stairs": "윤나는 페그마타이트 벽돌 계단", + "block.mineralogy.pegmatite_smooth_brick_slab": "윤나는 페그마타이트 벽돌 반 블록", "block.mineralogy.shale": "셰일", "block.mineralogy.shale_stairs": "셰일 계단", - "block.mineralogy.shale_slab": "셰일 슬래브", + "block.mineralogy.shale_slab": "셰일 반 블록", "block.mineralogy.shale_brick": "셰일 벽돌", "block.mineralogy.shale_brick_stairs": "셰일 벽돌 계단", - "block.mineralogy.shale_brick_slab": "셰일 벽돌 슬라브", - "block.mineralogy.shale_smooth": "연마된 셰일", - "block.mineralogy.shale_smooth_stairs": "셰일 광택 계단", - "block.mineralogy.shale_smooth_slab": "셰일 광택 슬래브", - "block.mineralogy.shale_smooth_brick": "셰일 광택 벽돌", - "block.mineralogy.shale_smooth_brick_stairs": "셰일 광택 벽돌 계단", - "block.mineralogy.shale_smooth_brick_slab": "셰일 광택 벽돌 슬래브", - "block.mineralogy.conglomerate": "대기업", - "block.mineralogy.conglomerate_stairs": "대기업 계단", - "block.mineralogy.conglomerate_slab": "대기업 석판", - "block.mineralogy.conglomerate_brick": "대기업 벽돌", - "block.mineralogy.conglomerate_brick_stairs": "대기업 벽돌 계단", - "block.mineralogy.conglomerate_brick_slab": "대기업 벽돌 슬라브", - "block.mineralogy.conglomerate_smooth": "연마된 대기업", - "block.mineralogy.conglomerate_smooth_stairs": "복합 광택 계단", - "block.mineralogy.conglomerate_smooth_slab": "복합 광택 슬래브", - "block.mineralogy.conglomerate_smooth_brick": "복합 광택 벽돌", - "block.mineralogy.conglomerate_smooth_brick_stairs": "대기업 광택 벽돌 계단", - "block.mineralogy.conglomerate_smooth_brick_slab": "대기업 광택 벽돌 슬라브", - "block.mineralogy.dolomite": "돌로미티", - "block.mineralogy.dolomite_stairs": "돌로미티 계단", - "block.mineralogy.dolomite_slab": "백운석 석판", - "block.mineralogy.dolomite_brick": "백운석 벽돌", - "block.mineralogy.dolomite_brick_stairs": "백운석 벽돌 계단", - "block.mineralogy.dolomite_brick_slab": "백운석 벽돌 슬라브", - "block.mineralogy.dolomite_smooth": "연마된 백운석", - "block.mineralogy.dolomite_smooth_stairs": "백운석 광택 계단", - "block.mineralogy.dolomite_smooth_slab": "백운석 광택 슬래브", - "block.mineralogy.dolomite_smooth_brick": "백운석 광택 벽돌", - "block.mineralogy.dolomite_smooth_brick_stairs": "백운석 광택 벽돌 계단", - "block.mineralogy.dolomite_smooth_brick_slab": "백운석 광택 벽돌 슬래브", + "block.mineralogy.shale_brick_slab": "셰일 벽돌 반 블록", + "block.mineralogy.shale_smooth": "윤나는 셰일", + "block.mineralogy.shale_smooth_stairs": "윤나는 셰일 계단", + "block.mineralogy.shale_smooth_slab": "윤나는 셰일 반 블록", + "block.mineralogy.shale_smooth_brick": "윤나는 셰일 벽돌", + "block.mineralogy.shale_smooth_brick_stairs": "윤나는 셰일 벽돌 계단", + "block.mineralogy.shale_smooth_brick_slab": "윤나는 셰일 벽돌 반 블록", + "block.mineralogy.conglomerate": "역암", + "block.mineralogy.conglomerate_stairs": "역암 계단", + "block.mineralogy.conglomerate_slab": "역암 반 블록", + "block.mineralogy.conglomerate_brick": "역암 벽돌", + "block.mineralogy.conglomerate_brick_stairs": "역암 벽돌 계단", + "block.mineralogy.conglomerate_brick_slab": "역암 벽돌 반 블록", + "block.mineralogy.conglomerate_smooth": "윤나는 역암", + "block.mineralogy.conglomerate_smooth_stairs": "윤나는 역암 계단", + "block.mineralogy.conglomerate_smooth_slab": "윤나는 역암 반 블록", + "block.mineralogy.conglomerate_smooth_brick": "윤나는 역암 벽돌", + "block.mineralogy.conglomerate_smooth_brick_stairs": "윤나는 역암 벽돌 계단", + "block.mineralogy.conglomerate_smooth_brick_slab": "윤나는 역암 벽돌 반 블록", + "block.mineralogy.dolomite": "백운암", + "block.mineralogy.dolomite_stairs": "백운암 계단", + "block.mineralogy.dolomite_slab": "백운암 반 블록", + "block.mineralogy.dolomite_brick": "백운암 벽돌", + "block.mineralogy.dolomite_brick_stairs": "백운암 벽돌 계단", + "block.mineralogy.dolomite_brick_slab": "백운암 벽돌 반 블록", + "block.mineralogy.dolomite_smooth": "윤나는 백운암", + "block.mineralogy.dolomite_smooth_stairs": "윤나는 백운암 계단", + "block.mineralogy.dolomite_smooth_slab": "윤나는 백운암 반 블록", + "block.mineralogy.dolomite_smooth_brick": "윤나는 백운암 벽돌", + "block.mineralogy.dolomite_smooth_brick_stairs": "윤나는 백운암 벽돌 계단", + "block.mineralogy.dolomite_smooth_brick_slab": "윤나는 백운암 벽돌 반 블록", "block.mineralogy.limestone": "석회암", "block.mineralogy.limestone_stairs": "석회암 계단", - "block.mineralogy.limestone_slab": "석회석 석판", + "block.mineralogy.limestone_slab": "석회암 반 블록", "block.mineralogy.limestone_brick": "석회암 벽돌", "block.mineralogy.limestone_brick_stairs": "석회암 벽돌 계단", - "block.mineralogy.limestone_brick_slab": "석회암 벽돌 슬라브", - "block.mineralogy.limestone_smooth": "연마된 석회암", - "block.mineralogy.limestone_smooth_stairs": "석회암 광택 계단", - "block.mineralogy.limestone_smooth_slab": "석회석 광택 슬래브", - "block.mineralogy.limestone_smooth_brick": "석회석 광택 벽돌", - "block.mineralogy.limestone_smooth_brick_stairs": "석회암 광택 벽돌 계단", - "block.mineralogy.limestone_smooth_brick_slab": "석회석 광택 벽돌 슬래브", - "block.mineralogy.slate": "슬레이트", - "block.mineralogy.slate_stairs": "슬레이트 계단", - "block.mineralogy.slate_slab": "슬레이트 슬래브", - "block.mineralogy.slate_brick": "슬레이트 벽돌", - "block.mineralogy.slate_brick_stairs": "슬레이트 벽돌 계단", - "block.mineralogy.slate_brick_slab": "슬레이트 벽돌 슬라브", - "block.mineralogy.slate_smooth": "광택나는 슬레이트", - "block.mineralogy.slate_smooth_stairs": "슬레이트 광택 계단", - "block.mineralogy.slate_smooth_slab": "슬레이트 광택 슬래브", - "block.mineralogy.slate_smooth_brick": "슬레이트 광택 벽돌", - "block.mineralogy.slate_smooth_brick_stairs": "슬레이트 광택 벽돌 계단", - "block.mineralogy.slate_smooth_brick_slab": "슬레이트 광택 벽돌 슬라브", + "block.mineralogy.limestone_brick_slab": "석회암 벽돌 반 블록", + "block.mineralogy.limestone_smooth": "윤나는 석회암", + "block.mineralogy.limestone_smooth_stairs": "윤나는 석회암 계단", + "block.mineralogy.limestone_smooth_slab": "윤나는 석회암 반 블록", + "block.mineralogy.limestone_smooth_brick": "윤나는 석회암 벽돌", + "block.mineralogy.limestone_smooth_brick_stairs": "윤나는 석회암 벽돌 계단", + "block.mineralogy.limestone_smooth_brick_slab": "윤나는 석회암 벽돌 반 블록", + "block.mineralogy.slate": "점판암", + "block.mineralogy.slate_stairs": "점판암 계단", + "block.mineralogy.slate_slab": "점판암 반 블록", + "block.mineralogy.slate_brick": "점판암 벽돌", + "block.mineralogy.slate_brick_stairs": "점판암 벽돌 계단", + "block.mineralogy.slate_brick_slab": "점판암 벽돌 반 블록", + "block.mineralogy.slate_smooth": "윤나는 점판암", + "block.mineralogy.slate_smooth_stairs": "윤나는 점판암 계단", + "block.mineralogy.slate_smooth_slab": "윤나는 점판암 반 블록", + "block.mineralogy.slate_smooth_brick": "윤나는 점판암 벽돌", + "block.mineralogy.slate_smooth_brick_stairs": "윤나는 점판암 벽돌 계단", + "block.mineralogy.slate_smooth_brick_slab": "윤나는 점판암 벽돌 반 블록", "block.mineralogy.schist": "편암", "block.mineralogy.schist_stairs": "편암 계단", - "block.mineralogy.schist_slab": "편암 석판", + "block.mineralogy.schist_slab": "편암 반 블록", "block.mineralogy.schist_brick": "편암 벽돌", "block.mineralogy.schist_brick_stairs": "편암 벽돌 계단", - "block.mineralogy.schist_brick_slab": "편암 벽돌 슬라브", - "block.mineralogy.schist_smooth": "광택나는 편암", - "block.mineralogy.schist_smooth_stairs": "편암 광택 계단", - "block.mineralogy.schist_smooth_slab": "편암 광택 슬래브", - "block.mineralogy.schist_smooth_brick": "편암 광택 벽돌", - "block.mineralogy.schist_smooth_brick_stairs": "편암 광택 벽돌 계단", - "block.mineralogy.schist_smooth_brick_slab": "편암 광택 벽돌 슬라브", + "block.mineralogy.schist_brick_slab": "편암 벽돌 반 블록", + "block.mineralogy.schist_smooth": "윤나는 편암", + "block.mineralogy.schist_smooth_stairs": "윤나는 편암 계단", + "block.mineralogy.schist_smooth_slab": "윤나는 편암 반 블록", + "block.mineralogy.schist_smooth_brick": "윤나는 편암 벽돌", + "block.mineralogy.schist_smooth_brick_stairs": "윤나는 편암 벽돌 계단", + "block.mineralogy.schist_smooth_brick_slab": "윤나는 편암 벽돌 반 블록", "block.mineralogy.gneiss": "편마암", "block.mineralogy.gneiss_stairs": "편마암 계단", "block.mineralogy.gneiss_slab": "편마암 반 블록", "block.mineralogy.gneiss_brick": "편마암 벽돌", "block.mineralogy.gneiss_brick_stairs": "편마암 벽돌 계단", "block.mineralogy.gneiss_brick_slab": "편마암 벽돌 반 블록", - "block.mineralogy.gneiss_smooth": "연마된 편마암", - "block.mineralogy.gneiss_smooth_stairs": "편마암 광택 계단", - "block.mineralogy.gneiss_smooth_slab": "편마암 광택 반 블록", - "block.mineralogy.gneiss_smooth_brick": "편마암 광택 벽돌", - "block.mineralogy.gneiss_smooth_brick_stairs": "편마암 광택 벽돌 계단", - "block.mineralogy.gneiss_smooth_brick_slab": "편마암 광택 벽돌 슬래브", + "block.mineralogy.gneiss_smooth": "윤나는 편마암", + "block.mineralogy.gneiss_smooth_stairs": "윤나는 편마암 계단", + "block.mineralogy.gneiss_smooth_slab": "윤나는 편마암 반 블록", + "block.mineralogy.gneiss_smooth_brick": "윤나는 편마암 벽돌", + "block.mineralogy.gneiss_smooth_brick_stairs": "윤나는 편마암 벽돌 계단", + "block.mineralogy.gneiss_smooth_brick_slab": "윤나는 편마암 벽돌 반 블록", "block.mineralogy.marble": "대리석", "block.mineralogy.marble_stairs": "대리석 계단", - "block.mineralogy.marble_slab": "대리석 석판", + "block.mineralogy.marble_slab": "대리석 반 블록", "block.mineralogy.marble_brick": "대리석 벽돌", "block.mineralogy.marble_brick_stairs": "대리석 벽돌 계단", - "block.mineralogy.marble_brick_slab": "대리석 벽돌 슬라브", - "block.mineralogy.marble_smooth": "연마된 대리석", - "block.mineralogy.marble_smooth_stairs": "대리석 광택 계단", - "block.mineralogy.marble_smooth_slab": "대리석 광택 슬래브", - "block.mineralogy.marble_smooth_brick": "대리석 광택 벽돌", - "block.mineralogy.marble_smooth_brick_stairs": "대리석 광택 벽돌 계단", - "block.mineralogy.marble_smooth_brick_slab": "대리석 광택 벽돌 슬라브", + "block.mineralogy.marble_brick_slab": "대리석 벽돌 반 블록", + "block.mineralogy.marble_smooth": "윤나는 대리석", + "block.mineralogy.marble_smooth_stairs": "윤나는 대리석 계단", + "block.mineralogy.marble_smooth_slab": "윤나는 대리석 반 블록", + "block.mineralogy.marble_smooth_brick": "윤나는 대리석 벽돌", + "block.mineralogy.marble_smooth_brick_stairs": "윤나는 대리석 벽돌 계단", + "block.mineralogy.marble_smooth_brick_slab": "윤나는 대리석 벽돌 반 블록", "block.mineralogy.phyllite": "천매암", "block.mineralogy.phyllite_stairs": "천매암 계단", "block.mineralogy.phyllite_slab": "천매암 반 블록", "block.mineralogy.phyllite_brick": "천매암 벽돌", "block.mineralogy.phyllite_brick_stairs": "천매암 벽돌 계단", - "block.mineralogy.phyllite_brick_slab": "천매암 벽돌 슬라브", - "block.mineralogy.phyllite_smooth": "연마된 천매암", - "block.mineralogy.phyllite_smooth_stairs": "천매암 광택 계단", - "block.mineralogy.phyllite_smooth_slab": "천매암 광택 슬래브", - "block.mineralogy.phyllite_smooth_brick": "천매암 광택 벽돌", - "block.mineralogy.phyllite_smooth_brick_stairs": "천매암 광택 벽돌 계단", - "block.mineralogy.phyllite_smooth_brick_slab": "천매암 광택 벽돌 슬라브", - "block.mineralogy.amphibolite": "각섬석", + "block.mineralogy.phyllite_brick_slab": "천매암 벽돌 반 블록", + "block.mineralogy.phyllite_smooth": "윤나는 천매암", + "block.mineralogy.phyllite_smooth_stairs": "윤나는 천매암 계단", + "block.mineralogy.phyllite_smooth_slab": "윤나는 천매암 반 블록", + "block.mineralogy.phyllite_smooth_brick": "윤나는 천매암 벽돌", + "block.mineralogy.phyllite_smooth_brick_stairs": "윤나는 천매암 벽돌 계단", + "block.mineralogy.phyllite_smooth_brick_slab": "윤나는 천매암 벽돌 반 블록", + "block.mineralogy.amphibolite": "각섬암", "block.mineralogy.amphibolite_stairs": "각섬암 계단", - "block.mineralogy.amphibolite_slab": "각섬암 석판", + "block.mineralogy.amphibolite_slab": "각섬암 반 블록", "block.mineralogy.amphibolite_brick": "각섬암 벽돌", - "block.mineralogy.amphibolite_brick_stairs": "각섬석 벽돌 계단", - "block.mineralogy.amphibolite_brick_slab": "각섬석 벽돌 슬라브", - "block.mineralogy.amphibolite_smooth": "매끄러운각섬석", - "block.mineralogy.amphibolite_smooth_stairs": "각섬석 광택 계단", - "block.mineralogy.amphibolite_smooth_slab": "각섬석 광택 슬래브", - "block.mineralogy.amphibolite_smooth_brick": "각섬석 광택 벽돌", - "block.mineralogy.amphibolite_smooth_brick_stairs": "각섬석 광택 벽돌 계단", - "block.mineralogy.amphibolite_smooth_brick_slab": "각섬석 광택 벽돌 슬래브", + "block.mineralogy.amphibolite_brick_stairs": "각섬암 벽돌 계단", + "block.mineralogy.amphibolite_brick_slab": "각섬암 벽돌 반 블록", + "block.mineralogy.amphibolite_smooth": "윤나는 각섬암", + "block.mineralogy.amphibolite_smooth_stairs": "윤나는 각섬암 계단", + "block.mineralogy.amphibolite_smooth_slab": "윤나는 각섬암 반 블록", + "block.mineralogy.amphibolite_smooth_brick": "윤나는 각섬암 벽돌", + "block.mineralogy.amphibolite_smooth_brick_stairs": "윤나는 각섬암 벽돌 계단", + "block.mineralogy.amphibolite_smooth_brick_slab": "윤나는 각섬암 벽돌 반 블록", "item.mineralogy.gypsum_dust": "석고 가루", - "item.mineralogy.sulfur_dust": "유황 분말", - "item.mineralogy.phosphorous_dust": "인 분말", - "item.mineralogy.nitrate_dust": "질산염 분말", - "item.mineralogy.mineral_fertilizer": "미네랄 비료", + "item.mineralogy.sulfur_dust": "유황 가루", + "item.mineralogy.phosphorous_dust": "인 가루", + "item.mineralogy.nitrate_dust": "질산염 가루", + "item.mineralogy.mineral_fertilizer": "광물 비료", "block.mineralogy.chert": "처트", "block.mineralogy.gypsum": "석고", "block.mineralogy.pumice": "부석", "block.mineralogy.sulfur_block": "유황", "block.mineralogy.sulfur_ore": "유황 광석", "block.mineralogy.phosphorous_block": "인", - "block.mineralogy.phosphorous_ore": "인광석", + "block.mineralogy.phosphorous_ore": "인 광석", "block.mineralogy.nitrate_block": "질산염", "block.mineralogy.nitrate_ore": "질산염 광석", - "block.mineralogy.drywall_black": "검은색 건식벽체", - "block.mineralogy.drywall_red": "빨간색 건식벽체", - "block.mineralogy.drywall_green": "녹색 건식벽체", - "block.mineralogy.drywall_brown": "갈색 건식벽체", - "block.mineralogy.drywall_blue": "파란색 건식벽체", - "block.mineralogy.drywall_purple": "보라색 건식벽체", - "block.mineralogy.drywall_cyan": "청록색 건식벽체", - "block.mineralogy.drywall_silver": "밝은 회색 건식벽체", - "block.mineralogy.drywall_gray": "회색 건식벽체", - "block.mineralogy.drywall_pink": "핑크 건식벽체", - "block.mineralogy.drywall_lime": "라임-그린 건식벽", - "block.mineralogy.drywall_yellow": "노란색 건식벽체", - "block.mineralogy.drywall_light_blue": "연청색 건식벽체", - "block.mineralogy.drywall_magenta": "마젠타 건식벽체", - "block.mineralogy.drywall_orange": "주황색 건식벽체", - "block.mineralogy.drywall_white": "흰색 건식벽체", - "block.mineralogy.andesite_wall": "안산암 벽", - "block.mineralogy.andesite_brick_wall": "안산암 벽돌 벽", - "block.mineralogy.andesite_smooth_wall": "안산암 광택 벽", - "block.mineralogy.andesite_smooth_brick_wall": "안산암 광택 벽돌 벽", - "block.mineralogy.basalt_wall": "현무암 벽", - "block.mineralogy.basalt_brick_wall": "현무암 벽돌 벽", - "block.mineralogy.basalt_smooth_wall": "현무암 광택 벽", - "block.mineralogy.basalt_smooth_brick_wall": "현무암 광택 벽돌 벽", - "block.mineralogy.diorite_wall": "섬록암 벽", - "block.mineralogy.diorite_brick_wall": "섬록암 벽돌 벽", - "block.mineralogy.diorite_smooth_wall": "섬록암 광택 벽", - "block.mineralogy.diorite_smooth_brick_wall": "섬록암 광택 벽돌 벽", - "block.mineralogy.granite_wall": "화강암 벽", - "block.mineralogy.granite_brick_wall": "화강암 벽돌 벽", - "block.mineralogy.granite_smooth_wall": "화강암 광택 벽", - "block.mineralogy.granite_smooth_brick_wall": "화강암 광택 벽돌 벽", - "block.mineralogy.rhyolite_wall": "유문암 벽", - "block.mineralogy.rhyolite_brick_wall": "유문암 벽돌 벽", - "block.mineralogy.rhyolite_smooth_wall": "유문암 광택 벽", - "block.mineralogy.rhyolite_smooth_brick_wall": "유문암 광택 벽돌 벽", - "block.mineralogy.pegmatite_wall": "페그마타이트 벽", - "block.mineralogy.pegmatite_brick_wall": "페그마타이트 벽돌 벽", - "block.mineralogy.pegmatite_smooth_wall": "페그마타이트 광택 벽", - "block.mineralogy.pegmatite_smooth_brick_wall": "페그마타이트 광택 벽돌 벽", - "block.mineralogy.shale_wall": "셰일 벽", - "block.mineralogy.shale_brick_wall": "셰일 벽돌 벽", - "block.mineralogy.shale_smooth_wall": "셰일 광택 벽", - "block.mineralogy.shale_smooth_brick_wall": "셰일 광택 벽돌 벽", - "block.mineralogy.conglomerate_wall": "대기업 벽", - "block.mineralogy.conglomerate_brick_wall": "대기업 벽돌담", - "block.mineralogy.conglomerate_smooth_wall": "복합 광택 벽", - "block.mineralogy.conglomerate_smooth_brick_wall": "복합 광택 벽돌 벽", - "block.mineralogy.dolomite_wall": "백운석 벽", - "block.mineralogy.dolomite_brick_wall": "백운석 벽돌 벽", - "block.mineralogy.dolomite_smooth_wall": "백운석 광택 벽", - "block.mineralogy.dolomite_smooth_brick_wall": "백운석 광택 벽돌 벽", - "block.mineralogy.limestone_wall": "석회암 벽", - "block.mineralogy.limestone_brick_wall": "석회암 벽돌 벽", - "block.mineralogy.limestone_smooth_wall": "석회암 광택 벽", - "block.mineralogy.limestone_smooth_brick_wall": "석회암 광택 벽돌 벽", - "block.mineralogy.marble_wall": "대리석 벽", - "block.mineralogy.marble_brick_wall": "대리석 벽돌 벽", - "block.mineralogy.marble_smooth_wall": "대리석 광택 벽", - "block.mineralogy.marble_smooth_brick_wall": "대리석 광택 벽돌 벽", - "block.mineralogy.slate_wall": "슬레이트 벽", - "block.mineralogy.slate_brick_wall": "슬레이트 벽돌 벽", - "block.mineralogy.slate_smooth_wall": "슬레이트 광택 벽", - "block.mineralogy.slate_smooth_brick_wall": "슬레이트 광택 벽돌 벽", - "block.mineralogy.schist_wall": "편암벽", - "block.mineralogy.schist_brick_wall": "편암 벽돌 벽", - "block.mineralogy.schist_smooth_wall": "편암 광택 벽", - "block.mineralogy.schist_smooth_brick_wall": "편암 광택 벽돌 벽", - "block.mineralogy.gneiss_wall": "편마암 벽", - "block.mineralogy.gneiss_brick_wall": "편마암 벽돌 벽", - "block.mineralogy.gneiss_smooth_wall": "편마암 광택 벽", - "block.mineralogy.gneiss_smooth_brick_wall": "편마암 광택 벽돌 벽", - "block.mineralogy.phyllite_wall": "천매암 벽", - "block.mineralogy.phyllite_brick_wall": "천매암 벽돌 벽", - "block.mineralogy.phyllite_smooth_wall": "천매암 광택 벽", - "block.mineralogy.phyllite_smooth_brick_wall": "천매암 광택 벽돌 벽", - "block.mineralogy.amphibolite_wall": "각섬석 벽", - "block.mineralogy.amphibolite_brick_wall": "각섬석 벽돌 벽", - "block.mineralogy.amphibolite_smooth_wall": "각섬석 광택 벽", - "block.mineralogy.amphibolite_smooth_brick_wall": "각섬석 광택 벽돌 벽", - "block.mineralogy.andesite_furnace": "안산암로", - "block.mineralogy.andesite_brick_furnace": "안산암 벽돌로", - "block.mineralogy.andesite_smooth_furnace": "안산암 연마로", - "block.mineralogy.andesite_smooth_brick_furnace": "안산암 광택 벽돌로", - "block.mineralogy.basalt_furnace": "현무암 용광로", - "block.mineralogy.basalt_brick_furnace": "현무암 벽돌로", - "block.mineralogy.basalt_smooth_furnace": "현무암 광택로", - "block.mineralogy.basalt_smooth_brick_furnace": "현무암 광택 벽돌로", - "block.mineralogy.diorite_furnace": "섬록암로", - "block.mineralogy.diorite_brick_furnace": "섬록암 벽돌로", - "block.mineralogy.diorite_smooth_furnace": "섬록암 광택로", - "block.mineralogy.diorite_smooth_brick_furnace": "섬록암 광택 벽돌로", + "block.mineralogy.drywall_black": "검은색 석고보드", + "block.mineralogy.drywall_red": "빨간색 석고보드", + "block.mineralogy.drywall_green": "초록색 석고보드", + "block.mineralogy.drywall_brown": "갈색 석고보드", + "block.mineralogy.drywall_blue": "파란색 석고보드", + "block.mineralogy.drywall_purple": "보라색 석고보드", + "block.mineralogy.drywall_cyan": "청록색 석고보드", + "block.mineralogy.drywall_silver": "밝은 회색 석고보드", + "block.mineralogy.drywall_gray": "회색 석고보드", + "block.mineralogy.drywall_pink": "분홍색 석고보드", + "block.mineralogy.drywall_lime": "연두색 석고보드", + "block.mineralogy.drywall_yellow": "노란색 석고보드", + "block.mineralogy.drywall_light_blue": "하늘색 석고보드", + "block.mineralogy.drywall_magenta": "자홍색 석고보드", + "block.mineralogy.drywall_orange": "주황색 석고보드", + "block.mineralogy.drywall_white": "흰색 석고보드", + "block.mineralogy.andesite_wall": "안산암 담장", + "block.mineralogy.andesite_brick_wall": "안산암 벽돌 담장", + "block.mineralogy.andesite_smooth_wall": "윤나는 안산암 담장", + "block.mineralogy.andesite_smooth_brick_wall": "윤나는 안산암 벽돌 담장", + "block.mineralogy.basalt_wall": "현무암 담장", + "block.mineralogy.basalt_brick_wall": "현무암 벽돌 담장", + "block.mineralogy.basalt_smooth_wall": "윤나는 현무암 담장", + "block.mineralogy.basalt_smooth_brick_wall": "윤나는 현무암 벽돌 담장", + "block.mineralogy.diorite_wall": "섬록암 담장", + "block.mineralogy.diorite_brick_wall": "섬록암 벽돌 담장", + "block.mineralogy.diorite_smooth_wall": "윤나는 섬록암 담장", + "block.mineralogy.diorite_smooth_brick_wall": "윤나는 섬록암 벽돌 담장", + "block.mineralogy.granite_wall": "화강암 담장", + "block.mineralogy.granite_brick_wall": "화강암 벽돌 담장", + "block.mineralogy.granite_smooth_wall": "윤나는 화강암 담장", + "block.mineralogy.granite_smooth_brick_wall": "윤나는 화강암 벽돌 담장", + "block.mineralogy.rhyolite_wall": "유문암 담장", + "block.mineralogy.rhyolite_brick_wall": "유문암 벽돌 담장", + "block.mineralogy.rhyolite_smooth_wall": "윤나는 유문암 담장", + "block.mineralogy.rhyolite_smooth_brick_wall": "윤나는 유문암 벽돌 담장", + "block.mineralogy.pegmatite_wall": "페그마타이트 담장", + "block.mineralogy.pegmatite_brick_wall": "페그마타이트 벽돌 담장", + "block.mineralogy.pegmatite_smooth_wall": "윤나는 페그마타이트 담장", + "block.mineralogy.pegmatite_smooth_brick_wall": "윤나는 페그마타이트 벽돌 담장", + "block.mineralogy.shale_wall": "셰일 담장", + "block.mineralogy.shale_brick_wall": "셰일 벽돌 담장", + "block.mineralogy.shale_smooth_wall": "윤나는 셰일 담장", + "block.mineralogy.shale_smooth_brick_wall": "윤나는 셰일 벽돌 담장", + "block.mineralogy.conglomerate_wall": "역암 담장", + "block.mineralogy.conglomerate_brick_wall": "역암 벽돌 담장", + "block.mineralogy.conglomerate_smooth_wall": "윤나는 역암 담장", + "block.mineralogy.conglomerate_smooth_brick_wall": "윤나는 역암 벽돌 담장", + "block.mineralogy.dolomite_wall": "백운암 담장", + "block.mineralogy.dolomite_brick_wall": "백운암 벽돌 담장", + "block.mineralogy.dolomite_smooth_wall": "윤나는 백운암 담장", + "block.mineralogy.dolomite_smooth_brick_wall": "윤나는 백운암 벽돌 담장", + "block.mineralogy.limestone_wall": "석회암 담장", + "block.mineralogy.limestone_brick_wall": "석회암 벽돌 담장", + "block.mineralogy.limestone_smooth_wall": "윤나는 석회암 담장", + "block.mineralogy.limestone_smooth_brick_wall": "윤나는 석회암 벽돌 담장", + "block.mineralogy.marble_wall": "대리석 담장", + "block.mineralogy.marble_brick_wall": "대리석 벽돌 담장", + "block.mineralogy.marble_smooth_wall": "윤나는 대리석 담장", + "block.mineralogy.marble_smooth_brick_wall": "윤나는 대리석 벽돌 담장", + "block.mineralogy.slate_wall": "점판암 담장", + "block.mineralogy.slate_brick_wall": "점판암 벽돌 담장", + "block.mineralogy.slate_smooth_wall": "윤나는 점판암 담장", + "block.mineralogy.slate_smooth_brick_wall": "윤나는 점판암 벽돌 담장", + "block.mineralogy.schist_wall": "편암 담장", + "block.mineralogy.schist_brick_wall": "편암 벽돌 담장", + "block.mineralogy.schist_smooth_wall": "윤나는 편암 담장", + "block.mineralogy.schist_smooth_brick_wall": "윤나는 편암 벽돌 담장", + "block.mineralogy.gneiss_wall": "편마암 담장", + "block.mineralogy.gneiss_brick_wall": "편마암 벽돌 담장", + "block.mineralogy.gneiss_smooth_wall": "윤나는 편마암 담장", + "block.mineralogy.gneiss_smooth_brick_wall": "윤나는 편마암 벽돌 담장", + "block.mineralogy.phyllite_wall": "천매암 담장", + "block.mineralogy.phyllite_brick_wall": "천매암 벽돌 담장", + "block.mineralogy.phyllite_smooth_wall": "윤나는 천매암 담장", + "block.mineralogy.phyllite_smooth_brick_wall": "윤나는 천매암 벽돌 담장", + "block.mineralogy.amphibolite_wall": "각섬암 담장", + "block.mineralogy.amphibolite_brick_wall": "각섬암 벽돌 담장", + "block.mineralogy.amphibolite_smooth_wall": "윤나는 각섬암 담장", + "block.mineralogy.amphibolite_smooth_brick_wall": "윤나는 각섬암 벽돌 담장", + "block.mineralogy.andesite_furnace": "안산암 화로", + "block.mineralogy.andesite_brick_furnace": "안산암 벽돌 화로", + "block.mineralogy.andesite_smooth_furnace": "윤나는 안산암 화로", + "block.mineralogy.andesite_smooth_brick_furnace": "윤나는 안산암 벽돌 화로", + "block.mineralogy.basalt_furnace": "현무암 화로", + "block.mineralogy.basalt_brick_furnace": "현무암 벽돌 화로", + "block.mineralogy.basalt_smooth_furnace": "윤나는 현무암 화로", + "block.mineralogy.basalt_smooth_brick_furnace": "윤나는 현무암 벽돌 화로", + "block.mineralogy.diorite_furnace": "섬록암 화로", + "block.mineralogy.diorite_brick_furnace": "섬록암 벽돌 화로", + "block.mineralogy.diorite_smooth_furnace": "윤나는 섬록암 화로", + "block.mineralogy.diorite_smooth_brick_furnace": "윤나는 섬록암 벽돌 화로", "block.mineralogy.granite_furnace": "화강암 화로", - "block.mineralogy.granite_brick_furnace": "화강암 벽돌로", - "block.mineralogy.granite_smooth_furnace": "화강암 광택로", - "block.mineralogy.granite_smooth_brick_furnace": "화강암 광택 벽돌 용광로", + "block.mineralogy.granite_brick_furnace": "화강암 벽돌 화로", + "block.mineralogy.granite_smooth_furnace": "윤나는 화강암 화로", + "block.mineralogy.granite_smooth_brick_furnace": "윤나는 화강암 벽돌 화로", "block.mineralogy.rhyolite_furnace": "유문암 화로", - "block.mineralogy.rhyolite_brick_furnace": "유문암 벽돌로", - "block.mineralogy.rhyolite_smooth_furnace": "유문암 연마로", - "block.mineralogy.rhyolite_smooth_brick_furnace": "유문암 광택 벽돌로", - "block.mineralogy.pegmatite_furnace": "페그마타이트 용광로", - "block.mineralogy.pegmatite_brick_furnace": "페그마타이트 벽돌로", - "block.mineralogy.pegmatite_smooth_furnace": "페그마타이트 연마로", - "block.mineralogy.pegmatite_smooth_brick_furnace": "페그마타이트 연마 벽돌로", - "block.mineralogy.shale_furnace": "셰일로", - "block.mineralogy.shale_brick_furnace": "셰일 벽돌 용광로", - "block.mineralogy.shale_smooth_furnace": "셰일 연마로", - "block.mineralogy.shale_smooth_brick_furnace": "셰일 광택 벽돌 용광로", - "block.mineralogy.conglomerate_furnace": "대기업 용광로", - "block.mineralogy.conglomerate_brick_furnace": "대기업 벽돌로", - "block.mineralogy.conglomerate_smooth_furnace": "대기업 연마로", - "block.mineralogy.conglomerate_smooth_brick_furnace": "대기업 광택 벽돌로", - "block.mineralogy.dolomite_furnace": "백운석 용광로", - "block.mineralogy.dolomite_brick_furnace": "백운석 벽돌로", - "block.mineralogy.dolomite_smooth_furnace": "백운석 연마로", - "block.mineralogy.dolomite_smooth_brick_furnace": "백운석 광택 벽돌로", - "block.mineralogy.limestone_furnace": "석회암로", - "block.mineralogy.limestone_brick_furnace": "석회석 벽돌로", - "block.mineralogy.limestone_smooth_furnace": "석회석 연마로", - "block.mineralogy.limestone_smooth_brick_furnace": "석회석 광택 벽돌로", - "block.mineralogy.marble_furnace": "대리석 용광로", - "block.mineralogy.marble_brick_furnace": "대리석 벽돌로", - "block.mineralogy.marble_smooth_furnace": "대리석 광택로", - "block.mineralogy.marble_smooth_brick_furnace": "대리석 광택 벽돌로", - "block.mineralogy.slate_furnace": "슬레이트 화로", - "block.mineralogy.slate_brick_furnace": "슬레이트 벽돌로", - "block.mineralogy.slate_smooth_furnace": "슬레이트 광택로", - "block.mineralogy.slate_smooth_brick_furnace": "슬레이트 광택 벽돌 용광로", - "block.mineralogy.schist_furnace": "편암로", - "block.mineralogy.schist_brick_furnace": "편암 벽돌로", - "block.mineralogy.schist_smooth_furnace": "편암 광택로", - "block.mineralogy.schist_smooth_brick_furnace": "편암 광택 벽돌로", - "block.mineralogy.gneiss_furnace": "편마암 용광로", - "block.mineralogy.gneiss_brick_furnace": "편마암 벽돌로", - "block.mineralogy.gneiss_smooth_furnace": "편마암 연마로", - "block.mineralogy.gneiss_smooth_brick_furnace": "편마암 연마 벽돌로", - "block.mineralogy.phyllite_furnace": "천매암로", - "block.mineralogy.phyllite_brick_furnace": "천매암 벽돌로", - "block.mineralogy.phyllite_smooth_furnace": "천매암 연마로", - "block.mineralogy.phyllite_smooth_brick_furnace": "천매암 광택 벽돌로", - "block.mineralogy.amphibolite_furnace": "각섬암로", - "block.mineralogy.amphibolite_brick_furnace": "각섬석 벽돌로", - "block.mineralogy.amphibolite_smooth_furnace": "각섬석 광택로", - "block.mineralogy.amphibolite_smooth_brick_furnace": "각섬석 광택 벽돌로", - "block.mineralogy.diabase": "디아베이스", - "block.mineralogy.diabase_stairs": "디아베이스 계단", - "block.mineralogy.diabase_slab": "다이암베이스 반 블록", - "block.mineralogy.diabase_brick": "디아베이스 벽돌", - "block.mineralogy.diabase_brick_stairs": "디아베이스 벽돌 계단", - "block.mineralogy.diabase_brick_slab": "디아베이스 벽돌 슬라브", - "block.mineralogy.diabase_smooth": "연마된 다이암베이스", - "block.mineralogy.diabase_smooth_stairs": "다이아베이스 광택 계단", - "block.mineralogy.diabase_smooth_slab": "다이암베이스 광택 슬래브", - "block.mineralogy.diabase_smooth_brick": "다이아베이스 광택 벽돌", - "block.mineralogy.diabase_smooth_brick_stairs": "디아베이스 광택 벽돌 계단", - "block.mineralogy.diabase_smooth_brick_slab": "디아베이스 광택 벽돌 슬래브", - "block.mineralogy.diabase_wall": "다이암베이스 벽", - "block.mineralogy.diabase_brick_wall": "디아베이스 벽돌 벽", - "block.mineralogy.diabase_smooth_wall": "다이아베이스 광택 벽", - "block.mineralogy.diabase_smooth_brick_wall": "디아베이스 광택 벽돌 벽", - "block.mineralogy.diabase_furnace": "다이아베이스 용광로", - "block.mineralogy.diabase_brick_furnace": "디아베이스 벽돌로", - "block.mineralogy.diabase_smooth_furnace": "다이아베이스 연마로", - "block.mineralogy.diabase_smooth_brick_furnace": "다이아베이스 광택 벽돌로", - "block.mineralogy.gabbro": "개브로", - "block.mineralogy.gabbro_stairs": "개브로 계단", - "block.mineralogy.gabbro_slab": "반려암 석판", - "block.mineralogy.gabbro_brick": "개브로 벽돌", - "block.mineralogy.gabbro_brick_stairs": "개브로 벽돌 계단", - "block.mineralogy.gabbro_brick_slab": "개브로 벽돌 슬라브", - "block.mineralogy.gabbro_smooth": "광택나는 개브로", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro 광택 계단", - "block.mineralogy.gabbro_smooth_slab": "Gabbro 광택 슬래브", - "block.mineralogy.gabbro_smooth_brick": "Gabbro 광택 벽돌", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro 광택 벽돌 계단", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro 광택 벽돌 슬래브", - "block.mineralogy.gabbro_wall": "개브로 벽", - "block.mineralogy.gabbro_brick_wall": "개브로 벽돌벽", - "block.mineralogy.gabbro_smooth_wall": "Gabbro 광택 벽", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro 광택 벽돌 벽", - "block.mineralogy.gabbro_furnace": "개브로 화로", - "block.mineralogy.gabbro_brick_furnace": "개브로 벽돌로", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro 광택로", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro 광택 벽돌로", + "block.mineralogy.rhyolite_brick_furnace": "유문암 벽돌 화로", + "block.mineralogy.rhyolite_smooth_furnace": "윤나는 유문암 화로", + "block.mineralogy.rhyolite_smooth_brick_furnace": "윤나는 유문암 벽돌 화로", + "block.mineralogy.pegmatite_furnace": "페그마타이트 화로", + "block.mineralogy.pegmatite_brick_furnace": "페그마타이트 벽돌 화로", + "block.mineralogy.pegmatite_smooth_furnace": "윤나는 페그마타이트 화로", + "block.mineralogy.pegmatite_smooth_brick_furnace": "윤나는 페그마타이트 벽돌 화로", + "block.mineralogy.shale_furnace": "셰일 화로", + "block.mineralogy.shale_brick_furnace": "셰일 벽돌 화로", + "block.mineralogy.shale_smooth_furnace": "윤나는 셰일 화로", + "block.mineralogy.shale_smooth_brick_furnace": "윤나는 셰일 벽돌 화로", + "block.mineralogy.conglomerate_furnace": "역암 화로", + "block.mineralogy.conglomerate_brick_furnace": "역암 벽돌 화로", + "block.mineralogy.conglomerate_smooth_furnace": "윤나는 역암 화로", + "block.mineralogy.conglomerate_smooth_brick_furnace": "윤나는 역암 벽돌 화로", + "block.mineralogy.dolomite_furnace": "백운암 화로", + "block.mineralogy.dolomite_brick_furnace": "백운암 벽돌 화로", + "block.mineralogy.dolomite_smooth_furnace": "윤나는 백운암 화로", + "block.mineralogy.dolomite_smooth_brick_furnace": "윤나는 백운암 벽돌 화로", + "block.mineralogy.limestone_furnace": "석회암 화로", + "block.mineralogy.limestone_brick_furnace": "석회암 벽돌 화로", + "block.mineralogy.limestone_smooth_furnace": "윤나는 석회암 화로", + "block.mineralogy.limestone_smooth_brick_furnace": "윤나는 석회암 벽돌 화로", + "block.mineralogy.marble_furnace": "대리석 화로", + "block.mineralogy.marble_brick_furnace": "대리석 벽돌 화로", + "block.mineralogy.marble_smooth_furnace": "윤나는 대리석 화로", + "block.mineralogy.marble_smooth_brick_furnace": "윤나는 대리석 벽돌 화로", + "block.mineralogy.slate_furnace": "점판암 화로", + "block.mineralogy.slate_brick_furnace": "점판암 벽돌 화로", + "block.mineralogy.slate_smooth_furnace": "윤나는 점판암 화로", + "block.mineralogy.slate_smooth_brick_furnace": "윤나는 점판암 벽돌 화로", + "block.mineralogy.schist_furnace": "편암 화로", + "block.mineralogy.schist_brick_furnace": "편암 벽돌 화로", + "block.mineralogy.schist_smooth_furnace": "윤나는 편암 화로", + "block.mineralogy.schist_smooth_brick_furnace": "윤나는 편암 벽돌 화로", + "block.mineralogy.gneiss_furnace": "편마암 화로", + "block.mineralogy.gneiss_brick_furnace": "편마암 벽돌 화로", + "block.mineralogy.gneiss_smooth_furnace": "윤나는 편마암 화로", + "block.mineralogy.gneiss_smooth_brick_furnace": "윤나는 편마암 벽돌 화로", + "block.mineralogy.phyllite_furnace": "천매암 화로", + "block.mineralogy.phyllite_brick_furnace": "천매암 벽돌 화로", + "block.mineralogy.phyllite_smooth_furnace": "윤나는 천매암 화로", + "block.mineralogy.phyllite_smooth_brick_furnace": "윤나는 천매암 벽돌 화로", + "block.mineralogy.amphibolite_furnace": "각섬암 화로", + "block.mineralogy.amphibolite_brick_furnace": "각섬암 벽돌 화로", + "block.mineralogy.amphibolite_smooth_furnace": "윤나는 각섬암 화로", + "block.mineralogy.amphibolite_smooth_brick_furnace": "윤나는 각섬암 벽돌 화로", + "block.mineralogy.diabase": "휘록암", + "block.mineralogy.diabase_stairs": "휘록암 계단", + "block.mineralogy.diabase_slab": "휘록암 반 블록", + "block.mineralogy.diabase_brick": "휘록암 벽돌", + "block.mineralogy.diabase_brick_stairs": "휘록암 벽돌 계단", + "block.mineralogy.diabase_brick_slab": "휘록암 벽돌 반 블록", + "block.mineralogy.diabase_smooth": "윤나는 휘록암", + "block.mineralogy.diabase_smooth_stairs": "윤나는 휘록암 계단", + "block.mineralogy.diabase_smooth_slab": "윤나는 휘록암 반 블록", + "block.mineralogy.diabase_smooth_brick": "윤나는 휘록암 벽돌", + "block.mineralogy.diabase_smooth_brick_stairs": "윤나는 휘록암 벽돌 계단", + "block.mineralogy.diabase_smooth_brick_slab": "윤나는 휘록암 벽돌 반 블록", + "block.mineralogy.diabase_wall": "휘록암 담장", + "block.mineralogy.diabase_brick_wall": "휘록암 벽돌 담장", + "block.mineralogy.diabase_smooth_wall": "윤나는 휘록암 담장", + "block.mineralogy.diabase_smooth_brick_wall": "윤나는 휘록암 벽돌 담장", + "block.mineralogy.diabase_furnace": "휘록암 화로", + "block.mineralogy.diabase_brick_furnace": "휘록암 벽돌 화로", + "block.mineralogy.diabase_smooth_furnace": "윤나는 휘록암 화로", + "block.mineralogy.diabase_smooth_brick_furnace": "윤나는 휘록암 벽돌 화로", + "block.mineralogy.gabbro": "반려암", + "block.mineralogy.gabbro_stairs": "반려암 계단", + "block.mineralogy.gabbro_slab": "반려암 반 블록", + "block.mineralogy.gabbro_brick": "반려암 벽돌", + "block.mineralogy.gabbro_brick_stairs": "반려암 벽돌 계단", + "block.mineralogy.gabbro_brick_slab": "반려암 벽돌 반 블록", + "block.mineralogy.gabbro_smooth": "윤나는 반려암", + "block.mineralogy.gabbro_smooth_stairs": "윤나는 반려암 계단", + "block.mineralogy.gabbro_smooth_slab": "윤나는 반려암 반 블록", + "block.mineralogy.gabbro_smooth_brick": "윤나는 반려암 벽돌", + "block.mineralogy.gabbro_smooth_brick_stairs": "윤나는 반려암 벽돌 계단", + "block.mineralogy.gabbro_smooth_brick_slab": "윤나는 반려암 벽돌 반 블록", + "block.mineralogy.gabbro_wall": "반려암 담장", + "block.mineralogy.gabbro_brick_wall": "반려암 벽돌 담장", + "block.mineralogy.gabbro_smooth_wall": "윤나는 반려암 담장", + "block.mineralogy.gabbro_smooth_brick_wall": "윤나는 반려암 벽돌 담장", + "block.mineralogy.gabbro_furnace": "반려암 화로", + "block.mineralogy.gabbro_brick_furnace": "반려암 벽돌 화로", + "block.mineralogy.gabbro_smooth_furnace": "윤나는 반려암 화로", + "block.mineralogy.gabbro_smooth_brick_furnace": "윤나는 반려암 벽돌 화로", "block.mineralogy.peridotite": "감람암", - "block.mineralogy.peridotite_stairs": "감람석 계단", - "block.mineralogy.peridotite_slab": "감람암 석판", - "block.mineralogy.peridotite_brick": "감람석 벽돌", + "block.mineralogy.peridotite_stairs": "감람암 계단", + "block.mineralogy.peridotite_slab": "감람암 반 블록", + "block.mineralogy.peridotite_brick": "감람암 벽돌", "block.mineralogy.peridotite_brick_stairs": "감람암 벽돌 계단", - "block.mineralogy.peridotite_brick_slab": "감람석 벽돌 슬라브", - "block.mineralogy.peridotite_smooth": "연마된 감람암", - "block.mineralogy.peridotite_smooth_stairs": "감람암 광택 계단", - "block.mineralogy.peridotite_smooth_slab": "감람석 광택 슬라브", - "block.mineralogy.peridotite_smooth_brick": "감람석 광택 벽돌", - "block.mineralogy.peridotite_smooth_brick_stairs": "감람암 광택 벽돌 계단", - "block.mineralogy.peridotite_smooth_brick_slab": "감람암 광택 벽돌 슬라브", - "block.mineralogy.peridotite_wall": "감람석 벽", - "block.mineralogy.peridotite_brick_wall": "감람암 벽돌 벽", - "block.mineralogy.peridotite_smooth_wall": "감람암 광택 벽", - "block.mineralogy.peridotite_smooth_brick_wall": "감람암 광택 벽돌 벽", - "block.mineralogy.peridotite_furnace": "감람석 용광로", - "block.mineralogy.peridotite_brick_furnace": "감람석 벽돌로", - "block.mineralogy.peridotite_smooth_furnace": "감람석 연마로", - "block.mineralogy.peridotite_smooth_brick_furnace": "감람석 광택 벽돌로", - "block.mineralogy.basaltic_glass": "현무암 유리", - "block.mineralogy.basaltic_glass_stairs": "현무암 유리 계단", - "block.mineralogy.basaltic_glass_slab": "현무암 유리판", - "block.mineralogy.basaltic_glass_brick": "현무암 유리 벽돌", - "block.mineralogy.basaltic_glass_brick_stairs": "현무암 유리 벽돌 계단", - "block.mineralogy.basaltic_glass_brick_slab": "현무암 유리 벽돌 석판", - "block.mineralogy.basaltic_glass_smooth": "연마된 현무암 유리", - "block.mineralogy.basaltic_glass_smooth_stairs": "현무암 유리 광택 계단", - "block.mineralogy.basaltic_glass_smooth_slab": "현무암 유리 광택 슬래브", - "block.mineralogy.basaltic_glass_smooth_brick": "현무암 유리 광택 벽돌", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "현무암 유리 광택 벽돌 계단", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "현무암 유리 광택 벽돌 슬래브", - "block.mineralogy.basaltic_glass_wall": "현무암 유리벽", - "block.mineralogy.basaltic_glass_brick_wall": "현무암 유리 벽돌 벽", - "block.mineralogy.basaltic_glass_smooth_wall": "현무암 유리 광택 벽", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "현무암 유리 광택 벽돌 벽", - "block.mineralogy.basaltic_glass_furnace": "현무암 유리 용광로", - "block.mineralogy.basaltic_glass_brick_furnace": "현무암 유리 벽돌로", - "block.mineralogy.basaltic_glass_smooth_furnace": "현무암 유리 연마로", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "현무암 유리 광택 벽돌로", + "block.mineralogy.peridotite_brick_slab": "감람암 벽돌 반 블록", + "block.mineralogy.peridotite_smooth": "윤나는 감람암", + "block.mineralogy.peridotite_smooth_stairs": "윤나는 감람암 계단", + "block.mineralogy.peridotite_smooth_slab": "윤나는 감람암 반 블록", + "block.mineralogy.peridotite_smooth_brick": "윤나는 감람암 벽돌", + "block.mineralogy.peridotite_smooth_brick_stairs": "윤나는 감람암 벽돌 계단", + "block.mineralogy.peridotite_smooth_brick_slab": "윤나는 감람암 벽돌 반 블록", + "block.mineralogy.peridotite_wall": "감람암 담장", + "block.mineralogy.peridotite_brick_wall": "감람암 벽돌 담장", + "block.mineralogy.peridotite_smooth_wall": "윤나는 감람암 담장", + "block.mineralogy.peridotite_smooth_brick_wall": "윤나는 감람암 벽돌 담장", + "block.mineralogy.peridotite_furnace": "감람암 화로", + "block.mineralogy.peridotite_brick_furnace": "감람암 벽돌 화로", + "block.mineralogy.peridotite_smooth_furnace": "윤나는 감람암 화로", + "block.mineralogy.peridotite_smooth_brick_furnace": "윤나는 감람암 벽돌 화로", + "block.mineralogy.basaltic_glass": "현무암질 유리", + "block.mineralogy.basaltic_glass_stairs": "현무암질 유리 계단", + "block.mineralogy.basaltic_glass_slab": "현무암질 유리 반 블록", + "block.mineralogy.basaltic_glass_brick": "현무암질 유리 벽돌", + "block.mineralogy.basaltic_glass_brick_stairs": "현무암질 유리 벽돌 계단", + "block.mineralogy.basaltic_glass_brick_slab": "현무암질 유리 벽돌 반 블록", + "block.mineralogy.basaltic_glass_smooth": "윤나는 현무암질 유리", + "block.mineralogy.basaltic_glass_smooth_stairs": "윤나는 현무암질 유리 계단", + "block.mineralogy.basaltic_glass_smooth_slab": "윤나는 현무암질 유리 반 블록", + "block.mineralogy.basaltic_glass_smooth_brick": "윤나는 현무암질 유리 벽돌", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "윤나는 현무암질 유리 벽돌 계단", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "윤나는 현무암질 유리 벽돌 반 블록", + "block.mineralogy.basaltic_glass_wall": "현무암질 유리 담장", + "block.mineralogy.basaltic_glass_brick_wall": "현무암질 유리 벽돌 담장", + "block.mineralogy.basaltic_glass_smooth_wall": "윤나는 현무암질 유리 담장", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "윤나는 현무암질 유리 벽돌 담장", + "block.mineralogy.basaltic_glass_furnace": "현무암질 유리 화로", + "block.mineralogy.basaltic_glass_brick_furnace": "현무암질 유리 벽돌 화로", + "block.mineralogy.basaltic_glass_smooth_furnace": "윤나는 현무암질 유리 화로", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "윤나는 현무암질 유리 벽돌 화로", "block.mineralogy.scoria": "스코리아", "block.mineralogy.scoria_stairs": "스코리아 계단", - "block.mineralogy.scoria_slab": "스코리아 석판", - "block.mineralogy.scoria_brick": "스리아 벽돌", - "block.mineralogy.scoria_brick_stairs": "스리아 벽돌 계단", - "block.mineralogy.scoria_brick_slab": "스리아 벽돌 슬라브", - "block.mineralogy.scoria_smooth": "광택나는 스리아", - "block.mineralogy.scoria_smooth_stairs": "스코리아 광택 계단", - "block.mineralogy.scoria_smooth_slab": "스리아 광택 반 블록", - "block.mineralogy.scoria_smooth_brick": "스코리아 광택 벽돌", - "block.mineralogy.scoria_smooth_brick_stairs": "스코리아 광택 벽돌 계단", - "block.mineralogy.scoria_smooth_brick_slab": "스코리아 광택 벽돌 슬라브", - "block.mineralogy.scoria_wall": "스코리아 벽", - "block.mineralogy.scoria_brick_wall": "스리아 벽돌담", - "block.mineralogy.scoria_smooth_wall": "스코리아 광택 벽", - "block.mineralogy.scoria_smooth_brick_wall": "스코리아 광택 벽돌 벽", + "block.mineralogy.scoria_slab": "스코리아 반 블록", + "block.mineralogy.scoria_brick": "스코리아 벽돌", + "block.mineralogy.scoria_brick_stairs": "스코리아 벽돌 계단", + "block.mineralogy.scoria_brick_slab": "스코리아 벽돌 반 블록", + "block.mineralogy.scoria_smooth": "윤나는 스코리아", + "block.mineralogy.scoria_smooth_stairs": "윤나는 스코리아 계단", + "block.mineralogy.scoria_smooth_slab": "윤나는 스코리아 반 블록", + "block.mineralogy.scoria_smooth_brick": "윤나는 스코리아 벽돌", + "block.mineralogy.scoria_smooth_brick_stairs": "윤나는 스코리아 벽돌 계단", + "block.mineralogy.scoria_smooth_brick_slab": "윤나는 스코리아 벽돌 반 블록", + "block.mineralogy.scoria_wall": "스코리아 담장", + "block.mineralogy.scoria_brick_wall": "스코리아 벽돌 담장", + "block.mineralogy.scoria_smooth_wall": "윤나는 스코리아 담장", + "block.mineralogy.scoria_smooth_brick_wall": "윤나는 스코리아 벽돌 담장", "block.mineralogy.scoria_furnace": "스코리아 화로", - "block.mineralogy.scoria_brick_furnace": "스코리아 벽돌로", - "block.mineralogy.scoria_smooth_furnace": "스코리아 광택로", - "block.mineralogy.scoria_smooth_brick_furnace": "스코리아 광택 벽돌로", + "block.mineralogy.scoria_brick_furnace": "스코리아 벽돌 화로", + "block.mineralogy.scoria_smooth_furnace": "윤나는 스코리아 화로", + "block.mineralogy.scoria_smooth_brick_furnace": "윤나는 스코리아 벽돌 화로", "block.mineralogy.tuff": "응회암", "block.mineralogy.tuff_stairs": "응회암 계단", "block.mineralogy.tuff_slab": "응회암 반 블록", "block.mineralogy.tuff_brick": "응회암 벽돌", "block.mineralogy.tuff_brick_stairs": "응회암 벽돌 계단", "block.mineralogy.tuff_brick_slab": "응회암 벽돌 반 블록", - "block.mineralogy.tuff_smooth": "윤이 나는 응회암", - "block.mineralogy.tuff_smooth_stairs": "응회암 광택 계단", - "block.mineralogy.tuff_smooth_slab": "응회암 광택 반 블록", - "block.mineralogy.tuff_smooth_brick": "응회암 광택 벽돌", - "block.mineralogy.tuff_smooth_brick_stairs": "응회암 광택 벽돌 계단", - "block.mineralogy.tuff_smooth_brick_slab": "응회암 광택 벽돌 슬라브", - "block.mineralogy.tuff_wall": "응회암 벽", - "block.mineralogy.tuff_brick_wall": "응회암 벽돌 벽", - "block.mineralogy.tuff_smooth_wall": "응회암 광택 벽", - "block.mineralogy.tuff_smooth_brick_wall": "응회암 광택 벽돌 벽", - "block.mineralogy.tuff_furnace": "응회암로", - "block.mineralogy.tuff_brick_furnace": "응회암 벽돌로", - "block.mineralogy.tuff_smooth_furnace": "응회암 광택로", - "block.mineralogy.tuff_smooth_brick_furnace": "응회암 광택 벽돌로", - "block.mineralogy.siltstone": "실트암", - "block.mineralogy.siltstone_stairs": "실트스톤 계단", - "block.mineralogy.siltstone_slab": "실트암 반 블록", - "block.mineralogy.siltstone_brick": "실트암 벽돌", - "block.mineralogy.siltstone_brick_stairs": "실트스톤 벽돌 계단", + "block.mineralogy.tuff_smooth": "윤나는 응회암", + "block.mineralogy.tuff_smooth_stairs": "윤나는 응회암 계단", + "block.mineralogy.tuff_smooth_slab": "윤나는 응회암 반 블록", + "block.mineralogy.tuff_smooth_brick": "윤나는 응회암 벽돌", + "block.mineralogy.tuff_smooth_brick_stairs": "윤나는 응회암 벽돌 계단", + "block.mineralogy.tuff_smooth_brick_slab": "윤나는 응회암 벽돌 반 블록", + "block.mineralogy.tuff_wall": "응회암 담장", + "block.mineralogy.tuff_brick_wall": "응회암 벽돌 담장", + "block.mineralogy.tuff_smooth_wall": "윤나는 응회암 담장", + "block.mineralogy.tuff_smooth_brick_wall": "윤나는 응회암 벽돌 담장", + "block.mineralogy.tuff_furnace": "응회암 화로", + "block.mineralogy.tuff_brick_furnace": "응회암 벽돌 화로", + "block.mineralogy.tuff_smooth_furnace": "윤나는 응회암 화로", + "block.mineralogy.tuff_smooth_brick_furnace": "윤나는 응회암 벽돌 화로", + "block.mineralogy.siltstone": "미사암", + "block.mineralogy.siltstone_stairs": "미사암 계단", + "block.mineralogy.siltstone_slab": "미사암 반 블록", + "block.mineralogy.siltstone_brick": "미사암 벽돌", + "block.mineralogy.siltstone_brick_stairs": "미사암 벽돌 계단", "block.mineralogy.siltstone_brick_slab": "미사암 벽돌 반 블록", - "block.mineralogy.siltstone_smooth": "광택나는 실트암", - "block.mineralogy.siltstone_smooth_stairs": "실트스톤 광택 계단", - "block.mineralogy.siltstone_smooth_slab": "실트스톤 광택 반 블록", - "block.mineralogy.siltstone_smooth_brick": "실트스톤 광택 벽돌", - "block.mineralogy.siltstone_smooth_brick_stairs": "실트스톤 광택 벽돌 계단", - "block.mineralogy.siltstone_smooth_brick_slab": "실트스톤 광택 벽돌 슬라브", - "block.mineralogy.siltstone_wall": "실트스톤 성벽", - "block.mineralogy.siltstone_brick_wall": "실트암 벽돌 벽", - "block.mineralogy.siltstone_smooth_wall": "실트스톤 광택 벽", - "block.mineralogy.siltstone_smooth_brick_wall": "실트스톤 광택 벽돌 벽", - "block.mineralogy.siltstone_furnace": "미사암 용광로", - "block.mineralogy.siltstone_brick_furnace": "실트암 벽돌 용광로", - "block.mineralogy.siltstone_smooth_furnace": "미사암 연마로", - "block.mineralogy.siltstone_smooth_brick_furnace": "실트스톤 광택 벽돌 용광로", + "block.mineralogy.siltstone_smooth": "윤나는 미사암", + "block.mineralogy.siltstone_smooth_stairs": "윤나는 미사암 계단", + "block.mineralogy.siltstone_smooth_slab": "윤나는 미사암 반 블록", + "block.mineralogy.siltstone_smooth_brick": "윤나는 미사암 벽돌", + "block.mineralogy.siltstone_smooth_brick_stairs": "윤나는 미사암 벽돌 계단", + "block.mineralogy.siltstone_smooth_brick_slab": "윤나는 미사암 벽돌 반 블록", + "block.mineralogy.siltstone_wall": "미사암 담장", + "block.mineralogy.siltstone_brick_wall": "미사암 벽돌 담장", + "block.mineralogy.siltstone_smooth_wall": "윤나는 미사암 담장", + "block.mineralogy.siltstone_smooth_brick_wall": "윤나는 미사암 벽돌 담장", + "block.mineralogy.siltstone_furnace": "미사암 화로", + "block.mineralogy.siltstone_brick_furnace": "미사암 벽돌 화로", + "block.mineralogy.siltstone_smooth_furnace": "윤나는 미사암 화로", + "block.mineralogy.siltstone_smooth_brick_furnace": "윤나는 미사암 벽돌 화로", "block.mineralogy.rock_salt": "암염", "block.mineralogy.rock_salt_stairs": "암염 계단", - "block.mineralogy.rock_salt_slab": "암염반", + "block.mineralogy.rock_salt_slab": "암염 반 블록", "block.mineralogy.rock_salt_brick": "암염 벽돌", "block.mineralogy.rock_salt_brick_stairs": "암염 벽돌 계단", - "block.mineralogy.rock_salt_brick_slab": "암염 벽돌 슬라브", - "block.mineralogy.rock_salt_smooth": "연마된 암염", - "block.mineralogy.rock_salt_smooth_stairs": "암염 광택 계단", - "block.mineralogy.rock_salt_smooth_slab": "암염 연마반", - "block.mineralogy.rock_salt_smooth_brick": "암염 광택 벽돌", - "block.mineralogy.rock_salt_smooth_brick_stairs": "암염 광택 벽돌 계단", - "block.mineralogy.rock_salt_smooth_brick_slab": "암염 광택 벽돌 슬라브", - "block.mineralogy.rock_salt_wall": "암염벽", - "block.mineralogy.rock_salt_brick_wall": "암염 벽돌 벽", - "block.mineralogy.rock_salt_smooth_wall": "암염 광택 벽", - "block.mineralogy.rock_salt_smooth_brick_wall": "암염 광택 벽돌 벽", - "block.mineralogy.rock_salt_furnace": "암염로", - "block.mineralogy.rock_salt_brick_furnace": "암염 벽돌로", - "block.mineralogy.rock_salt_smooth_furnace": "암염 연마로", - "block.mineralogy.rock_salt_smooth_brick_furnace": "암염 광택 벽돌로", + "block.mineralogy.rock_salt_brick_slab": "암염 벽돌 반 블록", + "block.mineralogy.rock_salt_smooth": "윤나는 암염", + "block.mineralogy.rock_salt_smooth_stairs": "윤나는 암염 계단", + "block.mineralogy.rock_salt_smooth_slab": "윤나는 암염 반 블록", + "block.mineralogy.rock_salt_smooth_brick": "윤나는 암염 벽돌", + "block.mineralogy.rock_salt_smooth_brick_stairs": "윤나는 암염 벽돌 계단", + "block.mineralogy.rock_salt_smooth_brick_slab": "윤나는 암염 벽돌 반 블록", + "block.mineralogy.rock_salt_wall": "암염 담장", + "block.mineralogy.rock_salt_brick_wall": "암염 벽돌 담장", + "block.mineralogy.rock_salt_smooth_wall": "윤나는 암염 담장", + "block.mineralogy.rock_salt_smooth_brick_wall": "윤나는 암염 벽돌 담장", + "block.mineralogy.rock_salt_furnace": "암염 화로", + "block.mineralogy.rock_salt_brick_furnace": "암염 벽돌 화로", + "block.mineralogy.rock_salt_smooth_furnace": "윤나는 암염 화로", + "block.mineralogy.rock_salt_smooth_brick_furnace": "윤나는 암염 벽돌 화로", "block.mineralogy.hornfels": "혼펠스", "block.mineralogy.hornfels_stairs": "혼펠스 계단", - "block.mineralogy.hornfels_slab": "혼펠스 석판", + "block.mineralogy.hornfels_slab": "혼펠스 반 블록", "block.mineralogy.hornfels_brick": "혼펠스 벽돌", "block.mineralogy.hornfels_brick_stairs": "혼펠스 벽돌 계단", "block.mineralogy.hornfels_brick_slab": "혼펠스 벽돌 반 블록", - "block.mineralogy.hornfels_smooth": "광택나는 혼펠스", - "block.mineralogy.hornfels_smooth_stairs": "혼펠스 광택 계단", - "block.mineralogy.hornfels_smooth_slab": "혼펠스 광택 반 블록", - "block.mineralogy.hornfels_smooth_brick": "혼펠스 광택 벽돌", - "block.mineralogy.hornfels_smooth_brick_stairs": "혼펠스 광택 벽돌 계단", - "block.mineralogy.hornfels_smooth_brick_slab": "혼펠스 광택 벽돌 슬라브", - "block.mineralogy.hornfels_wall": "혼펠스 성벽", - "block.mineralogy.hornfels_brick_wall": "혼펠스 벽돌 벽", - "block.mineralogy.hornfels_smooth_wall": "혼펠스 광택 벽", - "block.mineralogy.hornfels_smooth_brick_wall": "혼펠스 광택 벽돌 벽", - "block.mineralogy.hornfels_furnace": "혼펠스 용광로", - "block.mineralogy.hornfels_brick_furnace": "혼펠스 벽돌 용광로", - "block.mineralogy.hornfels_smooth_furnace": "혼펠스 광택로", - "block.mineralogy.hornfels_smooth_brick_furnace": "혼펠스 광택 벽돌 용광로", + "block.mineralogy.hornfels_smooth": "윤나는 혼펠스", + "block.mineralogy.hornfels_smooth_stairs": "윤나는 혼펠스 계단", + "block.mineralogy.hornfels_smooth_slab": "윤나는 혼펠스 반 블록", + "block.mineralogy.hornfels_smooth_brick": "윤나는 혼펠스 벽돌", + "block.mineralogy.hornfels_smooth_brick_stairs": "윤나는 혼펠스 벽돌 계단", + "block.mineralogy.hornfels_smooth_brick_slab": "윤나는 혼펠스 벽돌 반 블록", + "block.mineralogy.hornfels_wall": "혼펠스 담장", + "block.mineralogy.hornfels_brick_wall": "혼펠스 벽돌 담장", + "block.mineralogy.hornfels_smooth_wall": "윤나는 혼펠스 담장", + "block.mineralogy.hornfels_smooth_brick_wall": "윤나는 혼펠스 벽돌 담장", + "block.mineralogy.hornfels_furnace": "혼펠스 화로", + "block.mineralogy.hornfels_brick_furnace": "혼펠스 벽돌 화로", + "block.mineralogy.hornfels_smooth_furnace": "윤나는 혼펠스 화로", + "block.mineralogy.hornfels_smooth_brick_furnace": "윤나는 혼펠스 벽돌 화로", "block.mineralogy.quartzite": "규암", "block.mineralogy.quartzite_stairs": "규암 계단", - "block.mineralogy.quartzite_slab": "규암 석판", + "block.mineralogy.quartzite_slab": "규암 반 블록", "block.mineralogy.quartzite_brick": "규암 벽돌", "block.mineralogy.quartzite_brick_stairs": "규암 벽돌 계단", - "block.mineralogy.quartzite_brick_slab": "규암 벽돌 슬라브", - "block.mineralogy.quartzite_smooth": "연마된 규암", - "block.mineralogy.quartzite_smooth_stairs": "규암 광택 계단", - "block.mineralogy.quartzite_smooth_slab": "규암 광택 슬래브", - "block.mineralogy.quartzite_smooth_brick": "규암 광택 벽돌", - "block.mineralogy.quartzite_smooth_brick_stairs": "규암 광택 벽돌 계단", - "block.mineralogy.quartzite_smooth_brick_slab": "규암 광택 벽돌 슬래브", - "block.mineralogy.quartzite_wall": "규암 벽", - "block.mineralogy.quartzite_brick_wall": "규암 벽돌 벽", - "block.mineralogy.quartzite_smooth_wall": "규암 광택 벽", - "block.mineralogy.quartzite_smooth_brick_wall": "규암 광택 벽돌 벽", - "block.mineralogy.quartzite_furnace": "규암로", - "block.mineralogy.quartzite_brick_furnace": "규암 벽돌로", - "block.mineralogy.quartzite_smooth_furnace": "규암 연마로", - "block.mineralogy.quartzite_smooth_brick_furnace": "규암 광택 벽돌로", + "block.mineralogy.quartzite_brick_slab": "규암 벽돌 반 블록", + "block.mineralogy.quartzite_smooth": "윤나는 규암", + "block.mineralogy.quartzite_smooth_stairs": "윤나는 규암 계단", + "block.mineralogy.quartzite_smooth_slab": "윤나는 규암 반 블록", + "block.mineralogy.quartzite_smooth_brick": "윤나는 규암 벽돌", + "block.mineralogy.quartzite_smooth_brick_stairs": "윤나는 규암 벽돌 계단", + "block.mineralogy.quartzite_smooth_brick_slab": "윤나는 규암 벽돌 반 블록", + "block.mineralogy.quartzite_wall": "규암 담장", + "block.mineralogy.quartzite_brick_wall": "규암 벽돌 담장", + "block.mineralogy.quartzite_smooth_wall": "윤나는 규암 담장", + "block.mineralogy.quartzite_smooth_brick_wall": "윤나는 규암 벽돌 담장", + "block.mineralogy.quartzite_furnace": "규암 화로", + "block.mineralogy.quartzite_brick_furnace": "규암 벽돌 화로", + "block.mineralogy.quartzite_smooth_furnace": "윤나는 규암 화로", + "block.mineralogy.quartzite_smooth_brick_furnace": "윤나는 규암 벽돌 화로", "block.mineralogy.novaculite": "노바큘라이트", "block.mineralogy.novaculite_stairs": "노바큘라이트 계단", - "block.mineralogy.novaculite_slab": "노바큐라이트 석판", + "block.mineralogy.novaculite_slab": "노바큘라이트 반 블록", "block.mineralogy.novaculite_brick": "노바큘라이트 벽돌", "block.mineralogy.novaculite_brick_stairs": "노바큘라이트 벽돌 계단", - "block.mineralogy.novaculite_brick_slab": "노바큐라이트 벽돌 슬라브", - "block.mineralogy.novaculite_smooth": "연마된 노바큐라이트", - "block.mineralogy.novaculite_smooth_stairs": "노바큘라이트 광택 계단", - "block.mineralogy.novaculite_smooth_slab": "노바큐라이트 광택 슬래브", - "block.mineralogy.novaculite_smooth_brick": "노바큐라이트 광택 벽돌", - "block.mineralogy.novaculite_smooth_brick_stairs": "노바큘라이트 광택 벽돌 계단", - "block.mineralogy.novaculite_smooth_brick_slab": "노바큘라이트 광택 벽돌 슬라브", - "block.mineralogy.novaculite_wall": "노바큘라이트 벽", - "block.mineralogy.novaculite_brick_wall": "노바큘라이트 벽돌 벽", - "block.mineralogy.novaculite_smooth_wall": "노바큘라이트 광택 벽", - "block.mineralogy.novaculite_smooth_brick_wall": "노바큐라이트 광택 벽돌 벽", + "block.mineralogy.novaculite_brick_slab": "노바큘라이트 벽돌 반 블록", + "block.mineralogy.novaculite_smooth": "윤나는 노바큘라이트", + "block.mineralogy.novaculite_smooth_stairs": "윤나는 노바큘라이트 계단", + "block.mineralogy.novaculite_smooth_slab": "윤나는 노바큘라이트 반 블록", + "block.mineralogy.novaculite_smooth_brick": "윤나는 노바큘라이트 벽돌", + "block.mineralogy.novaculite_smooth_brick_stairs": "윤나는 노바큘라이트 벽돌 계단", + "block.mineralogy.novaculite_smooth_brick_slab": "윤나는 노바큘라이트 벽돌 반 블록", + "block.mineralogy.novaculite_wall": "노바큘라이트 담장", + "block.mineralogy.novaculite_brick_wall": "노바큘라이트 벽돌 담장", + "block.mineralogy.novaculite_smooth_wall": "윤나는 노바큘라이트 담장", + "block.mineralogy.novaculite_smooth_brick_wall": "윤나는 노바큘라이트 벽돌 담장", "block.mineralogy.novaculite_furnace": "노바큘라이트 화로", - "block.mineralogy.novaculite_brick_furnace": "노바큘라이트 벽돌로", - "block.mineralogy.novaculite_smooth_furnace": "노바큐라이트 연마로", - "block.mineralogy.novaculite_smooth_brick_furnace": "노바큐라이트 광택 벽돌로", + "block.mineralogy.novaculite_brick_furnace": "노바큘라이트 벽돌 화로", + "block.mineralogy.novaculite_smooth_furnace": "윤나는 노바큘라이트 화로", + "block.mineralogy.novaculite_smooth_brick_furnace": "윤나는 노바큘라이트 벽돌 화로", "block.mineralogy.chalk": "분필", "item.mineralogy.chalk_dust": "분필 가루", "item.mineralogy.salt_dust": "소금", "item.mineralogy.rock_salt_dust": "암염 결정", "block.mineralogy.rocksaltlamp": "암염 램프", "block.mineralogy.rocksaltstreetlamp": "암염 가로등", - "block.mineralogy.andesite_relief_axe": "안산암 도끼 부조", - "block.mineralogy.andesite_relief_blank": "안산암 공백 부조", - "block.mineralogy.andesite_relief_cross": "안산암 교차 부조", - "block.mineralogy.andesite_relief_hammer": "안산암 해머 부조", - "block.mineralogy.andesite_relief_hoe": "안산암 괭이 부조", - "block.mineralogy.andesite_relief_horizontal": "안산암 수평 기복", - "block.mineralogy.andesite_relief_i": "안산암 I 부조", - "block.mineralogy.andesite_relief_left": "안산암 왼쪽 부조", - "block.mineralogy.andesite_relief_pickaxe": "안산암 곡괭이 부조", - "block.mineralogy.andesite_relief_plus": "안산암 플러스 구호", - "block.mineralogy.andesite_relief_right": "안산암 오른쪽 부조", - "block.mineralogy.andesite_relief_sword": "안산암 검 부조", - "block.mineralogy.andesite_relief_vertical": "안산암 수직 기복", - "block.mineralogy.basalt_relief_axe": "현무암 도끼 부조", - "block.mineralogy.basalt_relief_blank": "현무암 공백 부조", - "block.mineralogy.basalt_relief_cross": "현무암 십자가 부조", - "block.mineralogy.basalt_relief_hammer": "현무암 망치 부조", - "block.mineralogy.basalt_relief_hoe": "현무암 괭이 부조", - "block.mineralogy.basalt_relief_horizontal": "현무암 수평 부조", - "block.mineralogy.basalt_relief_i": "현무암 I 부조", - "block.mineralogy.basalt_relief_left": "현무암 왼쪽 부조", - "block.mineralogy.basalt_relief_pickaxe": "현무암 곡괭이 부조", - "block.mineralogy.basalt_relief_plus": "현무암 플러스 부조", - "block.mineralogy.basalt_relief_right": "현무암 오른쪽 부조", - "block.mineralogy.basalt_relief_sword": "현무암 검 부조", - "block.mineralogy.basalt_relief_vertical": "현무암 수직 기복", - "block.mineralogy.diorite_relief_axe": "섬록암 도끼 부조", - "block.mineralogy.diorite_relief_blank": "섬록암 공백 부조", - "block.mineralogy.diorite_relief_cross": "섬록암 십자 부조", - "block.mineralogy.diorite_relief_hammer": "섬록암 해머 부조", - "block.mineralogy.diorite_relief_hoe": "섬록암 괭이 부조", - "block.mineralogy.diorite_relief_horizontal": "섬록암 수평 부조", - "block.mineralogy.diorite_relief_i": "섬록석 I 부조", - "block.mineralogy.diorite_relief_left": "섬록암 왼쪽 부조", - "block.mineralogy.diorite_relief_pickaxe": "섬록암 곡괭이 부조", - "block.mineralogy.diorite_relief_plus": "섬록석 플러스 릴리프", - "block.mineralogy.diorite_relief_right": "섬록암 오른쪽 부조", - "block.mineralogy.diorite_relief_sword": "섬록암 검 부조", - "block.mineralogy.diorite_relief_vertical": "섬록암 수직 부조", - "block.mineralogy.granite_relief_axe": "화강암 도끼 부조", - "block.mineralogy.granite_relief_blank": "화강암 공백 부조", - "block.mineralogy.granite_relief_cross": "화강암 십자형 부조", - "block.mineralogy.granite_relief_hammer": "화강암 해머 부조", - "block.mineralogy.granite_relief_hoe": "화강암 괭이 부조", - "block.mineralogy.granite_relief_horizontal": "화강암 수평 부조", - "block.mineralogy.granite_relief_i": "화강암 I 부조", - "block.mineralogy.granite_relief_left": "화강암 왼쪽 부조", - "block.mineralogy.granite_relief_pickaxe": "화강암 곡괭이 부조", - "block.mineralogy.granite_relief_plus": "화강암 플러스 부조", - "block.mineralogy.granite_relief_right": "화강암 오른쪽 부조", - "block.mineralogy.granite_relief_sword": "화강암 검 부조", - "block.mineralogy.granite_relief_vertical": "화강암 수직 부조", - "block.mineralogy.rhyolite_relief_axe": "유문암 도끼 부조", - "block.mineralogy.rhyolite_relief_blank": "유문암 공백 부조", - "block.mineralogy.rhyolite_relief_cross": "유문암 십자가 부조", - "block.mineralogy.rhyolite_relief_hammer": "유문암 망치 부조", - "block.mineralogy.rhyolite_relief_hoe": "유문암 괭이 부조", - "block.mineralogy.rhyolite_relief_horizontal": "유문암 수평 부조", - "block.mineralogy.rhyolite_relief_i": "유문암 I 부조", - "block.mineralogy.rhyolite_relief_left": "유문암 왼쪽 부조", - "block.mineralogy.rhyolite_relief_pickaxe": "유문암 곡괭이 부조", - "block.mineralogy.rhyolite_relief_plus": "유문암 플러스 릴리프", - "block.mineralogy.rhyolite_relief_right": "유문암 오른쪽 부조", - "block.mineralogy.rhyolite_relief_sword": "유문암 검 부조", - "block.mineralogy.rhyolite_relief_vertical": "유문암 수직 부조", - "block.mineralogy.pegmatite_relief_axe": "페그마타이트 도끼 부조", - "block.mineralogy.pegmatite_relief_blank": "페그마타이트 공백 부조", - "block.mineralogy.pegmatite_relief_cross": "페그마타이트 십자 부조", - "block.mineralogy.pegmatite_relief_hammer": "페그마타이트 해머 부조", - "block.mineralogy.pegmatite_relief_hoe": "페그마타이트 괭이 부조", - "block.mineralogy.pegmatite_relief_horizontal": "페그마타이트 수평 부조", - "block.mineralogy.pegmatite_relief_i": "페그마타이트 I 부조", - "block.mineralogy.pegmatite_relief_left": "페그마타이트 왼쪽 부조", - "block.mineralogy.pegmatite_relief_pickaxe": "페그마타이트 곡괭이 부조", - "block.mineralogy.pegmatite_relief_plus": "페그마타이트 플러스 릴리프", - "block.mineralogy.pegmatite_relief_right": "페그마타이트 오른쪽 부조", - "block.mineralogy.pegmatite_relief_sword": "페그마타이트 검 부조", - "block.mineralogy.pegmatite_relief_vertical": "페그마타이트 수직 부조", - "block.mineralogy.shale_relief_axe": "셰일 도끼 부조", - "block.mineralogy.shale_relief_blank": "셰일 블랭크 부조", - "block.mineralogy.shale_relief_cross": "셰일 교차 부조", - "block.mineralogy.shale_relief_hammer": "셰일 해머 릴리프", - "block.mineralogy.shale_relief_hoe": "셰일 괭이 구호", - "block.mineralogy.shale_relief_horizontal": "셰일 수평 기복", - "block.mineralogy.shale_relief_i": "셰일 I 구호", - "block.mineralogy.shale_relief_left": "셰일 왼쪽 구호", - "block.mineralogy.shale_relief_pickaxe": "셰일 곡괭이 부조", - "block.mineralogy.shale_relief_plus": "셰일 플러스 릴리프", - "block.mineralogy.shale_relief_right": "셰일 우량 구호", - "block.mineralogy.shale_relief_sword": "셰일 검 부조", - "block.mineralogy.shale_relief_vertical": "셰일 수직 기복", - "block.mineralogy.conglomerate_relief_axe": "대기업 도끼 부조", - "block.mineralogy.conglomerate_relief_blank": "대기업 공백 부조", - "block.mineralogy.conglomerate_relief_cross": "대기업 교차 구호", - "block.mineralogy.conglomerate_relief_hammer": "대기업 망치 부조", - "block.mineralogy.conglomerate_relief_hoe": "대기업 호미 구호품", - "block.mineralogy.conglomerate_relief_horizontal": "대기업 수평 부조", - "block.mineralogy.conglomerate_relief_i": "대기업 I 구호", - "block.mineralogy.conglomerate_relief_left": "대기업 왼쪽 구호", - "block.mineralogy.conglomerate_relief_pickaxe": "대기업 곡괭이 부조", - "block.mineralogy.conglomerate_relief_plus": "대기업 플러스 구호", - "block.mineralogy.conglomerate_relief_right": "대기업 우익 구호", - "block.mineralogy.conglomerate_relief_sword": "대기업 검 부조", - "block.mineralogy.conglomerate_relief_vertical": "대기업 수직 부조", - "block.mineralogy.dolomite_relief_axe": "백운석 도끼 부조", - "block.mineralogy.dolomite_relief_blank": "백운석 공백 부조", - "block.mineralogy.dolomite_relief_cross": "백운석 십자 부조", - "block.mineralogy.dolomite_relief_hammer": "백운석 해머 부조", - "block.mineralogy.dolomite_relief_hoe": "백운석 괭이 부조", - "block.mineralogy.dolomite_relief_horizontal": "백운석 수평 부조", - "block.mineralogy.dolomite_relief_i": "백운석 I 부조", - "block.mineralogy.dolomite_relief_left": "백운석 왼쪽 부조", - "block.mineralogy.dolomite_relief_pickaxe": "백운석 곡괭이 부조", - "block.mineralogy.dolomite_relief_plus": "백운석 플러스 릴리프", - "block.mineralogy.dolomite_relief_right": "백운석 오른쪽 부조", - "block.mineralogy.dolomite_relief_sword": "백운석 검 부조", - "block.mineralogy.dolomite_relief_vertical": "백운석 수직 부조", - "block.mineralogy.limestone_relief_axe": "석회암 도끼 부조", - "block.mineralogy.limestone_relief_blank": "석회암 공백 부조", - "block.mineralogy.limestone_relief_cross": "석회암 십자가 부조", - "block.mineralogy.limestone_relief_hammer": "석회암 망치 부조", - "block.mineralogy.limestone_relief_hoe": "석회암 괭이 부조", - "block.mineralogy.limestone_relief_horizontal": "석회암 수평 부조", - "block.mineralogy.limestone_relief_i": "석회암 I 부조", - "block.mineralogy.limestone_relief_left": "석회암 왼쪽 부조", - "block.mineralogy.limestone_relief_pickaxe": "석회석 곡괭이 부조", - "block.mineralogy.limestone_relief_plus": "라임스톤 플러스 릴리프", - "block.mineralogy.limestone_relief_right": "석회암 오른쪽 부조", - "block.mineralogy.limestone_relief_sword": "석회암 검 부조", - "block.mineralogy.limestone_relief_vertical": "석회암 수직 부조", - "block.mineralogy.marble_relief_axe": "대리석 도끼 부조", - "block.mineralogy.marble_relief_blank": "대리석 공백 부조", - "block.mineralogy.marble_relief_cross": "대리석 십자가 부조", - "block.mineralogy.marble_relief_hammer": "대리석 망치 부조", - "block.mineralogy.marble_relief_hoe": "대리석 괭이 부조", - "block.mineralogy.marble_relief_horizontal": "대리석 수평 부조", - "block.mineralogy.marble_relief_i": "대리석 I 부조", - "block.mineralogy.marble_relief_left": "대리석 왼쪽 부조", - "block.mineralogy.marble_relief_pickaxe": "대리석 곡괭이 부조", - "block.mineralogy.marble_relief_plus": "마블 플러스 부조", - "block.mineralogy.marble_relief_right": "대리석 오른쪽 부조", - "block.mineralogy.marble_relief_sword": "대리석 검 부조", - "block.mineralogy.marble_relief_vertical": "대리석 수직 부조", - "block.mineralogy.slate_relief_axe": "슬레이트 도끼 부조", - "block.mineralogy.slate_relief_blank": "빈 슬레이트 부조", - "block.mineralogy.slate_relief_cross": "슬레이트 크로스 릴리프", - "block.mineralogy.slate_relief_hammer": "슬레이트 해머 부조", - "block.mineralogy.slate_relief_hoe": "슬레이트 괭이 구호", - "block.mineralogy.slate_relief_horizontal": "슬레이트 수평 부조", - "block.mineralogy.slate_relief_i": "슬레이트 I 부조", - "block.mineralogy.slate_relief_left": "슬레이트 왼쪽 부조", - "block.mineralogy.slate_relief_pickaxe": "슬레이트 곡괭이 부조", - "block.mineralogy.slate_relief_plus": "슬레이트 플러스 릴리프", - "block.mineralogy.slate_relief_right": "슬레이트 오른쪽 부조", - "block.mineralogy.slate_relief_sword": "슬레이트 검 부조", - "block.mineralogy.slate_relief_vertical": "슬레이트 수직 부조", - "block.mineralogy.schist_relief_axe": "편암 도끼 부조", - "block.mineralogy.schist_relief_blank": "편암 공백 부조", - "block.mineralogy.schist_relief_cross": "편암 교차 부조", - "block.mineralogy.schist_relief_hammer": "편암 망치 부조", - "block.mineralogy.schist_relief_hoe": "편암 괭이 구호품", - "block.mineralogy.schist_relief_horizontal": "편암 수평 부조", - "block.mineralogy.schist_relief_i": "편암 I 구호", - "block.mineralogy.schist_relief_left": "편암 왼쪽 구호", - "block.mineralogy.schist_relief_pickaxe": "편암 곡괭이 부조", - "block.mineralogy.schist_relief_plus": "편암 플러스 구호", - "block.mineralogy.schist_relief_right": "편암 오른쪽 구호", - "block.mineralogy.schist_relief_sword": "편암 검 부조", - "block.mineralogy.schist_relief_vertical": "편암 수직 릴리프", - "block.mineralogy.gneiss_relief_axe": "편마암 도끼 부조", - "block.mineralogy.gneiss_relief_blank": "편마암 공백 부조", - "block.mineralogy.gneiss_relief_cross": "편마암 십자형 부조", - "block.mineralogy.gneiss_relief_hammer": "편마암 망치 부조", - "block.mineralogy.gneiss_relief_hoe": "편마암 괭이 부조", - "block.mineralogy.gneiss_relief_horizontal": "편마암 수평 부조", - "block.mineralogy.gneiss_relief_i": "편마암 I 부조", - "block.mineralogy.gneiss_relief_left": "편마암 왼쪽 부조", - "block.mineralogy.gneiss_relief_pickaxe": "편마암 곡괭이 부조", - "block.mineralogy.gneiss_relief_plus": "편마암 플러스 릴리프", - "block.mineralogy.gneiss_relief_right": "편마암 오른쪽 부조", - "block.mineralogy.gneiss_relief_sword": "편마암 검 부조", - "block.mineralogy.gneiss_relief_vertical": "편마암 수직 부조", - "block.mineralogy.phyllite_relief_axe": "천매암 도끼 부조", - "block.mineralogy.phyllite_relief_blank": "천매암 공백 부조", - "block.mineralogy.phyllite_relief_cross": "천매암 교차 부조", - "block.mineralogy.phyllite_relief_hammer": "천매암 해머 부조", - "block.mineralogy.phyllite_relief_hoe": "천매암 괭이 구호", - "block.mineralogy.phyllite_relief_horizontal": "천매암 수평 부조", - "block.mineralogy.phyllite_relief_i": "천매암 I 부조", - "block.mineralogy.phyllite_relief_left": "천매암 왼쪽 부조", - "block.mineralogy.phyllite_relief_pickaxe": "천매암 곡괭이 부조", - "block.mineralogy.phyllite_relief_plus": "천매암 플러스 구호", - "block.mineralogy.phyllite_relief_right": "천매암 오른쪽 부조", - "block.mineralogy.phyllite_relief_sword": "천매암 검 부조", - "block.mineralogy.phyllite_relief_vertical": "천매암 수직 부조", - "block.mineralogy.amphibolite_relief_axe": "각섬석 도끼 부조", - "block.mineralogy.amphibolite_relief_blank": "각섬석 공백 부조", - "block.mineralogy.amphibolite_relief_cross": "각섬석 교차 부조", - "block.mineralogy.amphibolite_relief_hammer": "각섬석 해머 부조", - "block.mineralogy.amphibolite_relief_hoe": "각섬석 괭이 부조", - "block.mineralogy.amphibolite_relief_horizontal": "각섬석 수평 부조", - "block.mineralogy.amphibolite_relief_i": "각섬석 I 부조", - "block.mineralogy.amphibolite_relief_left": "각섬석 왼쪽 부조", - "block.mineralogy.amphibolite_relief_pickaxe": "각섬석 곡괭이 부조", - "block.mineralogy.amphibolite_relief_plus": "각섬석 플러스 릴리프", - "block.mineralogy.amphibolite_relief_right": "각섬석 오른쪽 부조", - "block.mineralogy.amphibolite_relief_sword": "각섬석 검 부조", - "block.mineralogy.amphibolite_relief_vertical": "각섬석 수직 부조", - "block.mineralogy.diabase_relief_axe": "다이아베이스 도끼 부조", - "block.mineralogy.diabase_relief_blank": "다이아베이스 블랭크 부조", - "block.mineralogy.diabase_relief_cross": "다이아베이스 크로스 릴리프", - "block.mineralogy.diabase_relief_hammer": "다이아베이스 해머 릴리프", - "block.mineralogy.diabase_relief_hoe": "다이아베이스 괭이 부조", - "block.mineralogy.diabase_relief_horizontal": "다이아베이스 수평 부조", - "block.mineralogy.diabase_relief_i": "디아베이스 I 부조", - "block.mineralogy.diabase_relief_left": "다이아베이스 왼쪽 부조", - "block.mineralogy.diabase_relief_pickaxe": "디아베이스 곡괭이 부조", - "block.mineralogy.diabase_relief_plus": "다이아베이스 플러스 릴리프", - "block.mineralogy.diabase_relief_right": "다이아베이스 오른쪽 부조", - "block.mineralogy.diabase_relief_sword": "다이아베이스 소드 릴리프", - "block.mineralogy.diabase_relief_vertical": "다이베이스 수직 릴리프", - "block.mineralogy.gabbro_relief_axe": "개브로 도끼 부조", - "block.mineralogy.gabbro_relief_blank": "개브로 블랭크 부조", - "block.mineralogy.gabbro_relief_cross": "개브로 크로스 릴리프", - "block.mineralogy.gabbro_relief_hammer": "개브로 해머 릴리프", - "block.mineralogy.gabbro_relief_hoe": "개브로 괭이 구호품", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro 수평 부조", - "block.mineralogy.gabbro_relief_i": "개브로 I 구호", - "block.mineralogy.gabbro_relief_left": "개브로 왼쪽 부조", - "block.mineralogy.gabbro_relief_pickaxe": "개브로 곡괭이 부조", - "block.mineralogy.gabbro_relief_plus": "가브로 플러스 릴리프", - "block.mineralogy.gabbro_relief_right": "개브로 오른쪽 부조", - "block.mineralogy.gabbro_relief_sword": "개브로 검 부조", - "block.mineralogy.gabbro_relief_vertical": "개브로 수직 부조", - "block.mineralogy.peridotite_relief_axe": "감람석 도끼 부조", - "block.mineralogy.peridotite_relief_blank": "감람석 공백 부조", - "block.mineralogy.peridotite_relief_cross": "감람석 십자가 부조", - "block.mineralogy.peridotite_relief_hammer": "감람암 해머 부조", - "block.mineralogy.peridotite_relief_hoe": "감람석 괭이 돋을새김", - "block.mineralogy.peridotite_relief_horizontal": "감람암 수평 부조", - "block.mineralogy.peridotite_relief_i": "감람석 I 부조", - "block.mineralogy.peridotite_relief_left": "감람암 왼쪽 부조", - "block.mineralogy.peridotite_relief_pickaxe": "감람석 곡괭이 부조", - "block.mineralogy.peridotite_relief_plus": "감람석 플러스 릴리프", - "block.mineralogy.peridotite_relief_right": "감람암 오른쪽 부조", - "block.mineralogy.peridotite_relief_sword": "감람암 검 부조", - "block.mineralogy.peridotite_relief_vertical": "감람암 수직 부조", - "block.mineralogy.basaltic_glass_relief_axe": "현무암 유리 도끼 부조", - "block.mineralogy.basaltic_glass_relief_blank": "현무암 유리 여백 부조", - "block.mineralogy.basaltic_glass_relief_cross": "현무암 유리 십자가 부조", - "block.mineralogy.basaltic_glass_relief_hammer": "현무암 유리 망치 부조", - "block.mineralogy.basaltic_glass_relief_hoe": "현무암 유리 괭이 부조", - "block.mineralogy.basaltic_glass_relief_horizontal": "현무암 유리 수평 부조", - "block.mineralogy.basaltic_glass_relief_i": "현무암 유리 I 부조", - "block.mineralogy.basaltic_glass_relief_left": "현무암 유리 왼쪽 부조", - "block.mineralogy.basaltic_glass_relief_pickaxe": "현무암 유리 곡괭이 부조", - "block.mineralogy.basaltic_glass_relief_plus": "현무암 유리 플러스 부조", - "block.mineralogy.basaltic_glass_relief_right": "현무암 유리 오른쪽 부조", - "block.mineralogy.basaltic_glass_relief_sword": "현무암 유리 검 부조", - "block.mineralogy.basaltic_glass_relief_vertical": "현무암 유리 수직 부조", - "block.mineralogy.scoria_relief_axe": "스코리아 도끼 부조", - "block.mineralogy.scoria_relief_blank": "스코리아 공백 부조", - "block.mineralogy.scoria_relief_cross": "스코리아 크로스 릴리프", - "block.mineralogy.scoria_relief_hammer": "스코리아 망치 부조", - "block.mineralogy.scoria_relief_hoe": "스코리아 괭이 부조", - "block.mineralogy.scoria_relief_horizontal": "스코리아 수평 부조", - "block.mineralogy.scoria_relief_i": "스코리아 I 부조", - "block.mineralogy.scoria_relief_left": "스코리아 왼쪽 부조", - "block.mineralogy.scoria_relief_pickaxe": "스코리아 곡괭이 부조", - "block.mineralogy.scoria_relief_plus": "스코리아 플러스 구호", - "block.mineralogy.scoria_relief_right": "스코리아 오른쪽 부조", - "block.mineralogy.scoria_relief_sword": "스코리아 검 부조", - "block.mineralogy.scoria_relief_vertical": "스코리아 수직 부조", - "block.mineralogy.tuff_relief_axe": "응회암 도끼 부조", - "block.mineralogy.tuff_relief_blank": "응회암 부조", - "block.mineralogy.tuff_relief_cross": "응회암 크로스 릴리프", - "block.mineralogy.tuff_relief_hammer": "응회암 부조", - "block.mineralogy.tuff_relief_hoe": "응회암 구호", - "block.mineralogy.tuff_relief_horizontal": "응회암 수평 부조", - "block.mineralogy.tuff_relief_i": "응회암 I 구호", - "block.mineralogy.tuff_relief_left": "응회암 왼쪽 구호", - "block.mineralogy.tuff_relief_pickaxe": "응회암 곡괭이 부조", - "block.mineralogy.tuff_relief_plus": "터프 플러스 릴리프", - "block.mineralogy.tuff_relief_right": "응회암 오른쪽 구호", - "block.mineralogy.tuff_relief_sword": "응회암 검 부조", - "block.mineralogy.tuff_relief_vertical": "응회암 수직 부조", - "block.mineralogy.siltstone_relief_axe": "실트스톤 도끼 부조", - "block.mineralogy.siltstone_relief_blank": "실트스톤 공백 부조", - "block.mineralogy.siltstone_relief_cross": "실트암 십자가 부조", - "block.mineralogy.siltstone_relief_hammer": "실트스톤 망치 부조", - "block.mineralogy.siltstone_relief_hoe": "실트스톤 괭이 부조", - "block.mineralogy.siltstone_relief_horizontal": "실트암 수평 부조", - "block.mineralogy.siltstone_relief_i": "실트스톤 I 부조", - "block.mineralogy.siltstone_relief_left": "실트암 왼쪽 부조", - "block.mineralogy.siltstone_relief_pickaxe": "실트스톤 곡괭이 부조", - "block.mineralogy.siltstone_relief_plus": "실트스톤 플러스 부조", - "block.mineralogy.siltstone_relief_right": "실트암 오른쪽 부조", - "block.mineralogy.siltstone_relief_sword": "실트스톤 검 부조", - "block.mineralogy.siltstone_relief_vertical": "실트암 수직 부조", - "block.mineralogy.rock_salt_relief_axe": "암염 도끼 부조", - "block.mineralogy.rock_salt_relief_blank": "암염 공백 부조", - "block.mineralogy.rock_salt_relief_cross": "암염 십자가 부조", - "block.mineralogy.rock_salt_relief_hammer": "암염 망치 부조", - "block.mineralogy.rock_salt_relief_hoe": "암염 괭이 부조", - "block.mineralogy.rock_salt_relief_horizontal": "암염 수평 부조", - "block.mineralogy.rock_salt_relief_i": "암염 I 구호", - "block.mineralogy.rock_salt_relief_left": "암염 왼쪽 부조", - "block.mineralogy.rock_salt_relief_pickaxe": "암염 곡괭이 부조", - "block.mineralogy.rock_salt_relief_plus": "암염 플러스 구호", - "block.mineralogy.rock_salt_relief_right": "암염 오른쪽 부조", - "block.mineralogy.rock_salt_relief_sword": "암염검 부조", - "block.mineralogy.rock_salt_relief_vertical": "암염 수직 부조", - "block.mineralogy.hornfels_relief_axe": "혼펠스 도끼 부조", - "block.mineralogy.hornfels_relief_blank": "혼펠스 공백 부조", - "block.mineralogy.hornfels_relief_cross": "혼펠스 크로스 릴리프", - "block.mineralogy.hornfels_relief_hammer": "혼펠스 해머 부조", - "block.mineralogy.hornfels_relief_hoe": "혼펠스 괭이 구호품", - "block.mineralogy.hornfels_relief_horizontal": "혼펠스 수평 부조", - "block.mineralogy.hornfels_relief_i": "혼펠스 I 구호", - "block.mineralogy.hornfels_relief_left": "혼펠스 왼쪽 구호", - "block.mineralogy.hornfels_relief_pickaxe": "혼펠스 곡괭이 부조", - "block.mineralogy.hornfels_relief_plus": "혼펠스 플러스 구호", - "block.mineralogy.hornfels_relief_right": "혼펠스 오른쪽 구호", - "block.mineralogy.hornfels_relief_sword": "혼펠스 검 부조", - "block.mineralogy.hornfels_relief_vertical": "혼펠스 수직 부조", - "block.mineralogy.quartzite_relief_axe": "규암 도끼 부조", - "block.mineralogy.quartzite_relief_blank": "규암 공백 부조", - "block.mineralogy.quartzite_relief_cross": "규암 교차 부조", - "block.mineralogy.quartzite_relief_hammer": "규암 해머 부조", - "block.mineralogy.quartzite_relief_hoe": "규암 괭이 부조", - "block.mineralogy.quartzite_relief_horizontal": "규암 수평 부조", - "block.mineralogy.quartzite_relief_i": "규암 I 부조", - "block.mineralogy.quartzite_relief_left": "규암 왼쪽 부조", - "block.mineralogy.quartzite_relief_pickaxe": "규암 곡괭이 부조", - "block.mineralogy.quartzite_relief_plus": "규암 플러스 부조", - "block.mineralogy.quartzite_relief_right": "규암 오른쪽 부조", - "block.mineralogy.quartzite_relief_sword": "규암 검 부조", - "block.mineralogy.quartzite_relief_vertical": "규암 수직 부조", - "block.mineralogy.novaculite_relief_axe": "노바큘라이트 도끼 부조", - "block.mineralogy.novaculite_relief_blank": "노바큘라이트 공백 부조", - "block.mineralogy.novaculite_relief_cross": "노바큘라이트 교차 부조", - "block.mineralogy.novaculite_relief_hammer": "노바큘라이트 해머 릴리프", - "block.mineralogy.novaculite_relief_hoe": "노바큘라이트 괭이 구호품", - "block.mineralogy.novaculite_relief_horizontal": "노바큘라이트 수평 부조", - "block.mineralogy.novaculite_relief_i": "노바큘라이트 I 부조", - "block.mineralogy.novaculite_relief_left": "노바큘라이트 왼쪽 부조", - "block.mineralogy.novaculite_relief_pickaxe": "노바큘라이트 곡괭이 부조", - "block.mineralogy.novaculite_relief_plus": "노바큘라이트 플러스 릴리프", - "block.mineralogy.novaculite_relief_right": "노바큘라이트 오른쪽 부조", - "block.mineralogy.novaculite_relief_sword": "노바큘라이트 검 부조", - "block.mineralogy.novaculite_relief_vertical": "노바큘라이트 수직 부조", - "advancements.mineralogy.all_the_rocks.title": "바위들을 루도라고 불러라!", - "advancements.mineralogy.all_the_rocks.description": "와, 광물학에서 표준 암석 유형을 모두 찾았습니다!", - "fluid.mineralogy.crude_oil": "원유", - "block.mineralogy.crude_oil": "원유", - "item.mineralogy.crude_oil_bucket": "원유 버킷", + "block.mineralogy.andesite_relief_axe": "안산암 부조 (도끼)", + "block.mineralogy.andesite_relief_blank": "안산암 부조 (무늬 없음)", + "block.mineralogy.andesite_relief_cross": "안산암 부조 (십자)", + "block.mineralogy.andesite_relief_hammer": "안산암 부조 (망치)", + "block.mineralogy.andesite_relief_hoe": "안산암 부조 (괭이)", + "block.mineralogy.andesite_relief_horizontal": "안산암 부조 (가로)", + "block.mineralogy.andesite_relief_i": "안산암 부조 (I)", + "block.mineralogy.andesite_relief_left": "안산암 부조 (왼쪽)", + "block.mineralogy.andesite_relief_pickaxe": "안산암 부조 (곡괭이)", + "block.mineralogy.andesite_relief_plus": "안산암 부조 (더하기 기호)", + "block.mineralogy.andesite_relief_right": "안산암 부조 (오른쪽)", + "block.mineralogy.andesite_relief_sword": "안산암 부조 (검)", + "block.mineralogy.andesite_relief_vertical": "안산암 부조 (세로)", + "block.mineralogy.basalt_relief_axe": "현무암 부조 (도끼)", + "block.mineralogy.basalt_relief_blank": "현무암 부조 (무늬 없음)", + "block.mineralogy.basalt_relief_cross": "현무암 부조 (십자)", + "block.mineralogy.basalt_relief_hammer": "현무암 부조 (망치)", + "block.mineralogy.basalt_relief_hoe": "현무암 부조 (괭이)", + "block.mineralogy.basalt_relief_horizontal": "현무암 부조 (가로)", + "block.mineralogy.basalt_relief_i": "현무암 부조 (I)", + "block.mineralogy.basalt_relief_left": "현무암 부조 (왼쪽)", + "block.mineralogy.basalt_relief_pickaxe": "현무암 부조 (곡괭이)", + "block.mineralogy.basalt_relief_plus": "현무암 부조 (더하기 기호)", + "block.mineralogy.basalt_relief_right": "현무암 부조 (오른쪽)", + "block.mineralogy.basalt_relief_sword": "현무암 부조 (검)", + "block.mineralogy.basalt_relief_vertical": "현무암 부조 (세로)", + "block.mineralogy.diorite_relief_axe": "섬록암 부조 (도끼)", + "block.mineralogy.diorite_relief_blank": "섬록암 부조 (무늬 없음)", + "block.mineralogy.diorite_relief_cross": "섬록암 부조 (십자)", + "block.mineralogy.diorite_relief_hammer": "섬록암 부조 (망치)", + "block.mineralogy.diorite_relief_hoe": "섬록암 부조 (괭이)", + "block.mineralogy.diorite_relief_horizontal": "섬록암 부조 (가로)", + "block.mineralogy.diorite_relief_i": "섬록암 부조 (I)", + "block.mineralogy.diorite_relief_left": "섬록암 부조 (왼쪽)", + "block.mineralogy.diorite_relief_pickaxe": "섬록암 부조 (곡괭이)", + "block.mineralogy.diorite_relief_plus": "섬록암 부조 (더하기 기호)", + "block.mineralogy.diorite_relief_right": "섬록암 부조 (오른쪽)", + "block.mineralogy.diorite_relief_sword": "섬록암 부조 (검)", + "block.mineralogy.diorite_relief_vertical": "섬록암 부조 (세로)", + "block.mineralogy.granite_relief_axe": "화강암 부조 (도끼)", + "block.mineralogy.granite_relief_blank": "화강암 부조 (무늬 없음)", + "block.mineralogy.granite_relief_cross": "화강암 부조 (십자)", + "block.mineralogy.granite_relief_hammer": "화강암 부조 (망치)", + "block.mineralogy.granite_relief_hoe": "화강암 부조 (괭이)", + "block.mineralogy.granite_relief_horizontal": "화강암 부조 (가로)", + "block.mineralogy.granite_relief_i": "화강암 부조 (I)", + "block.mineralogy.granite_relief_left": "화강암 부조 (왼쪽)", + "block.mineralogy.granite_relief_pickaxe": "화강암 부조 (곡괭이)", + "block.mineralogy.granite_relief_plus": "화강암 부조 (더하기 기호)", + "block.mineralogy.granite_relief_right": "화강암 부조 (오른쪽)", + "block.mineralogy.granite_relief_sword": "화강암 부조 (검)", + "block.mineralogy.granite_relief_vertical": "화강암 부조 (세로)", + "block.mineralogy.rhyolite_relief_axe": "유문암 부조 (도끼)", + "block.mineralogy.rhyolite_relief_blank": "유문암 부조 (무늬 없음)", + "block.mineralogy.rhyolite_relief_cross": "유문암 부조 (십자)", + "block.mineralogy.rhyolite_relief_hammer": "유문암 부조 (망치)", + "block.mineralogy.rhyolite_relief_hoe": "유문암 부조 (괭이)", + "block.mineralogy.rhyolite_relief_horizontal": "유문암 부조 (가로)", + "block.mineralogy.rhyolite_relief_i": "유문암 부조 (I)", + "block.mineralogy.rhyolite_relief_left": "유문암 부조 (왼쪽)", + "block.mineralogy.rhyolite_relief_pickaxe": "유문암 부조 (곡괭이)", + "block.mineralogy.rhyolite_relief_plus": "유문암 부조 (더하기 기호)", + "block.mineralogy.rhyolite_relief_right": "유문암 부조 (오른쪽)", + "block.mineralogy.rhyolite_relief_sword": "유문암 부조 (검)", + "block.mineralogy.rhyolite_relief_vertical": "유문암 부조 (세로)", + "block.mineralogy.pegmatite_relief_axe": "페그마타이트 부조 (도끼)", + "block.mineralogy.pegmatite_relief_blank": "페그마타이트 부조 (무늬 없음)", + "block.mineralogy.pegmatite_relief_cross": "페그마타이트 부조 (십자)", + "block.mineralogy.pegmatite_relief_hammer": "페그마타이트 부조 (망치)", + "block.mineralogy.pegmatite_relief_hoe": "페그마타이트 부조 (괭이)", + "block.mineralogy.pegmatite_relief_horizontal": "페그마타이트 부조 (가로)", + "block.mineralogy.pegmatite_relief_i": "페그마타이트 부조 (I)", + "block.mineralogy.pegmatite_relief_left": "페그마타이트 부조 (왼쪽)", + "block.mineralogy.pegmatite_relief_pickaxe": "페그마타이트 부조 (곡괭이)", + "block.mineralogy.pegmatite_relief_plus": "페그마타이트 부조 (더하기 기호)", + "block.mineralogy.pegmatite_relief_right": "페그마타이트 부조 (오른쪽)", + "block.mineralogy.pegmatite_relief_sword": "페그마타이트 부조 (검)", + "block.mineralogy.pegmatite_relief_vertical": "페그마타이트 부조 (세로)", + "block.mineralogy.shale_relief_axe": "셰일 부조 (도끼)", + "block.mineralogy.shale_relief_blank": "셰일 부조 (무늬 없음)", + "block.mineralogy.shale_relief_cross": "셰일 부조 (십자)", + "block.mineralogy.shale_relief_hammer": "셰일 부조 (망치)", + "block.mineralogy.shale_relief_hoe": "셰일 부조 (괭이)", + "block.mineralogy.shale_relief_horizontal": "셰일 부조 (가로)", + "block.mineralogy.shale_relief_i": "셰일 부조 (I)", + "block.mineralogy.shale_relief_left": "셰일 부조 (왼쪽)", + "block.mineralogy.shale_relief_pickaxe": "셰일 부조 (곡괭이)", + "block.mineralogy.shale_relief_plus": "셰일 부조 (더하기 기호)", + "block.mineralogy.shale_relief_right": "셰일 부조 (오른쪽)", + "block.mineralogy.shale_relief_sword": "셰일 부조 (검)", + "block.mineralogy.shale_relief_vertical": "셰일 부조 (세로)", + "block.mineralogy.conglomerate_relief_axe": "역암 부조 (도끼)", + "block.mineralogy.conglomerate_relief_blank": "역암 부조 (무늬 없음)", + "block.mineralogy.conglomerate_relief_cross": "역암 부조 (십자)", + "block.mineralogy.conglomerate_relief_hammer": "역암 부조 (망치)", + "block.mineralogy.conglomerate_relief_hoe": "역암 부조 (괭이)", + "block.mineralogy.conglomerate_relief_horizontal": "역암 부조 (가로)", + "block.mineralogy.conglomerate_relief_i": "역암 부조 (I)", + "block.mineralogy.conglomerate_relief_left": "역암 부조 (왼쪽)", + "block.mineralogy.conglomerate_relief_pickaxe": "역암 부조 (곡괭이)", + "block.mineralogy.conglomerate_relief_plus": "역암 부조 (더하기 기호)", + "block.mineralogy.conglomerate_relief_right": "역암 부조 (오른쪽)", + "block.mineralogy.conglomerate_relief_sword": "역암 부조 (검)", + "block.mineralogy.conglomerate_relief_vertical": "역암 부조 (세로)", + "block.mineralogy.dolomite_relief_axe": "백운암 부조 (도끼)", + "block.mineralogy.dolomite_relief_blank": "백운암 부조 (무늬 없음)", + "block.mineralogy.dolomite_relief_cross": "백운암 부조 (십자)", + "block.mineralogy.dolomite_relief_hammer": "백운암 부조 (망치)", + "block.mineralogy.dolomite_relief_hoe": "백운암 부조 (괭이)", + "block.mineralogy.dolomite_relief_horizontal": "백운암 부조 (가로)", + "block.mineralogy.dolomite_relief_i": "백운암 부조 (I)", + "block.mineralogy.dolomite_relief_left": "백운암 부조 (왼쪽)", + "block.mineralogy.dolomite_relief_pickaxe": "백운암 부조 (곡괭이)", + "block.mineralogy.dolomite_relief_plus": "백운암 부조 (더하기 기호)", + "block.mineralogy.dolomite_relief_right": "백운암 부조 (오른쪽)", + "block.mineralogy.dolomite_relief_sword": "백운암 부조 (검)", + "block.mineralogy.dolomite_relief_vertical": "백운암 부조 (세로)", + "block.mineralogy.limestone_relief_axe": "석회암 부조 (도끼)", + "block.mineralogy.limestone_relief_blank": "석회암 부조 (무늬 없음)", + "block.mineralogy.limestone_relief_cross": "석회암 부조 (십자)", + "block.mineralogy.limestone_relief_hammer": "석회암 부조 (망치)", + "block.mineralogy.limestone_relief_hoe": "석회암 부조 (괭이)", + "block.mineralogy.limestone_relief_horizontal": "석회암 부조 (가로)", + "block.mineralogy.limestone_relief_i": "석회암 부조 (I)", + "block.mineralogy.limestone_relief_left": "석회암 부조 (왼쪽)", + "block.mineralogy.limestone_relief_pickaxe": "석회암 부조 (곡괭이)", + "block.mineralogy.limestone_relief_plus": "석회암 부조 (더하기 기호)", + "block.mineralogy.limestone_relief_right": "석회암 부조 (오른쪽)", + "block.mineralogy.limestone_relief_sword": "석회암 부조 (검)", + "block.mineralogy.limestone_relief_vertical": "석회암 부조 (세로)", + "block.mineralogy.marble_relief_axe": "대리석 부조 (도끼)", + "block.mineralogy.marble_relief_blank": "대리석 부조 (무늬 없음)", + "block.mineralogy.marble_relief_cross": "대리석 부조 (십자)", + "block.mineralogy.marble_relief_hammer": "대리석 부조 (망치)", + "block.mineralogy.marble_relief_hoe": "대리석 부조 (괭이)", + "block.mineralogy.marble_relief_horizontal": "대리석 부조 (가로)", + "block.mineralogy.marble_relief_i": "대리석 부조 (I)", + "block.mineralogy.marble_relief_left": "대리석 부조 (왼쪽)", + "block.mineralogy.marble_relief_pickaxe": "대리석 부조 (곡괭이)", + "block.mineralogy.marble_relief_plus": "대리석 부조 (더하기 기호)", + "block.mineralogy.marble_relief_right": "대리석 부조 (오른쪽)", + "block.mineralogy.marble_relief_sword": "대리석 부조 (검)", + "block.mineralogy.marble_relief_vertical": "대리석 부조 (세로)", + "block.mineralogy.slate_relief_axe": "점판암 부조 (도끼)", + "block.mineralogy.slate_relief_blank": "점판암 부조 (무늬 없음)", + "block.mineralogy.slate_relief_cross": "점판암 부조 (십자)", + "block.mineralogy.slate_relief_hammer": "점판암 부조 (망치)", + "block.mineralogy.slate_relief_hoe": "점판암 부조 (괭이)", + "block.mineralogy.slate_relief_horizontal": "점판암 부조 (가로)", + "block.mineralogy.slate_relief_i": "점판암 부조 (I)", + "block.mineralogy.slate_relief_left": "점판암 부조 (왼쪽)", + "block.mineralogy.slate_relief_pickaxe": "점판암 부조 (곡괭이)", + "block.mineralogy.slate_relief_plus": "점판암 부조 (더하기 기호)", + "block.mineralogy.slate_relief_right": "점판암 부조 (오른쪽)", + "block.mineralogy.slate_relief_sword": "점판암 부조 (검)", + "block.mineralogy.slate_relief_vertical": "점판암 부조 (세로)", + "block.mineralogy.schist_relief_axe": "편암 부조 (도끼)", + "block.mineralogy.schist_relief_blank": "편암 부조 (무늬 없음)", + "block.mineralogy.schist_relief_cross": "편암 부조 (십자)", + "block.mineralogy.schist_relief_hammer": "편암 부조 (망치)", + "block.mineralogy.schist_relief_hoe": "편암 부조 (괭이)", + "block.mineralogy.schist_relief_horizontal": "편암 부조 (가로)", + "block.mineralogy.schist_relief_i": "편암 부조 (I)", + "block.mineralogy.schist_relief_left": "편암 부조 (왼쪽)", + "block.mineralogy.schist_relief_pickaxe": "편암 부조 (곡괭이)", + "block.mineralogy.schist_relief_plus": "편암 부조 (더하기 기호)", + "block.mineralogy.schist_relief_right": "편암 부조 (오른쪽)", + "block.mineralogy.schist_relief_sword": "편암 부조 (검)", + "block.mineralogy.schist_relief_vertical": "편암 부조 (세로)", + "block.mineralogy.gneiss_relief_axe": "편마암 부조 (도끼)", + "block.mineralogy.gneiss_relief_blank": "편마암 부조 (무늬 없음)", + "block.mineralogy.gneiss_relief_cross": "편마암 부조 (십자)", + "block.mineralogy.gneiss_relief_hammer": "편마암 부조 (망치)", + "block.mineralogy.gneiss_relief_hoe": "편마암 부조 (괭이)", + "block.mineralogy.gneiss_relief_horizontal": "편마암 부조 (가로)", + "block.mineralogy.gneiss_relief_i": "편마암 부조 (I)", + "block.mineralogy.gneiss_relief_left": "편마암 부조 (왼쪽)", + "block.mineralogy.gneiss_relief_pickaxe": "편마암 부조 (곡괭이)", + "block.mineralogy.gneiss_relief_plus": "편마암 부조 (더하기 기호)", + "block.mineralogy.gneiss_relief_right": "편마암 부조 (오른쪽)", + "block.mineralogy.gneiss_relief_sword": "편마암 부조 (검)", + "block.mineralogy.gneiss_relief_vertical": "편마암 부조 (세로)", + "block.mineralogy.phyllite_relief_axe": "천매암 부조 (도끼)", + "block.mineralogy.phyllite_relief_blank": "천매암 부조 (무늬 없음)", + "block.mineralogy.phyllite_relief_cross": "천매암 부조 (십자)", + "block.mineralogy.phyllite_relief_hammer": "천매암 부조 (망치)", + "block.mineralogy.phyllite_relief_hoe": "천매암 부조 (괭이)", + "block.mineralogy.phyllite_relief_horizontal": "천매암 부조 (가로)", + "block.mineralogy.phyllite_relief_i": "천매암 부조 (I)", + "block.mineralogy.phyllite_relief_left": "천매암 부조 (왼쪽)", + "block.mineralogy.phyllite_relief_pickaxe": "천매암 부조 (곡괭이)", + "block.mineralogy.phyllite_relief_plus": "천매암 부조 (더하기 기호)", + "block.mineralogy.phyllite_relief_right": "천매암 부조 (오른쪽)", + "block.mineralogy.phyllite_relief_sword": "천매암 부조 (검)", + "block.mineralogy.phyllite_relief_vertical": "천매암 부조 (세로)", + "block.mineralogy.amphibolite_relief_axe": "각섬암 부조 (도끼)", + "block.mineralogy.amphibolite_relief_blank": "각섬암 부조 (무늬 없음)", + "block.mineralogy.amphibolite_relief_cross": "각섬암 부조 (십자)", + "block.mineralogy.amphibolite_relief_hammer": "각섬암 부조 (망치)", + "block.mineralogy.amphibolite_relief_hoe": "각섬암 부조 (괭이)", + "block.mineralogy.amphibolite_relief_horizontal": "각섬암 부조 (가로)", + "block.mineralogy.amphibolite_relief_i": "각섬암 부조 (I)", + "block.mineralogy.amphibolite_relief_left": "각섬암 부조 (왼쪽)", + "block.mineralogy.amphibolite_relief_pickaxe": "각섬암 부조 (곡괭이)", + "block.mineralogy.amphibolite_relief_plus": "각섬암 부조 (더하기 기호)", + "block.mineralogy.amphibolite_relief_right": "각섬암 부조 (오른쪽)", + "block.mineralogy.amphibolite_relief_sword": "각섬암 부조 (검)", + "block.mineralogy.amphibolite_relief_vertical": "각섬암 부조 (세로)", + "block.mineralogy.diabase_relief_axe": "휘록암 부조 (도끼)", + "block.mineralogy.diabase_relief_blank": "휘록암 부조 (무늬 없음)", + "block.mineralogy.diabase_relief_cross": "휘록암 부조 (십자)", + "block.mineralogy.diabase_relief_hammer": "휘록암 부조 (망치)", + "block.mineralogy.diabase_relief_hoe": "휘록암 부조 (괭이)", + "block.mineralogy.diabase_relief_horizontal": "휘록암 부조 (가로)", + "block.mineralogy.diabase_relief_i": "휘록암 부조 (I)", + "block.mineralogy.diabase_relief_left": "휘록암 부조 (왼쪽)", + "block.mineralogy.diabase_relief_pickaxe": "휘록암 부조 (곡괭이)", + "block.mineralogy.diabase_relief_plus": "휘록암 부조 (더하기 기호)", + "block.mineralogy.diabase_relief_right": "휘록암 부조 (오른쪽)", + "block.mineralogy.diabase_relief_sword": "휘록암 부조 (검)", + "block.mineralogy.diabase_relief_vertical": "휘록암 부조 (세로)", + "block.mineralogy.gabbro_relief_axe": "반려암 부조 (도끼)", + "block.mineralogy.gabbro_relief_blank": "반려암 부조 (무늬 없음)", + "block.mineralogy.gabbro_relief_cross": "반려암 부조 (십자)", + "block.mineralogy.gabbro_relief_hammer": "반려암 부조 (망치)", + "block.mineralogy.gabbro_relief_hoe": "반려암 부조 (괭이)", + "block.mineralogy.gabbro_relief_horizontal": "반려암 부조 (가로)", + "block.mineralogy.gabbro_relief_i": "반려암 부조 (I)", + "block.mineralogy.gabbro_relief_left": "반려암 부조 (왼쪽)", + "block.mineralogy.gabbro_relief_pickaxe": "반려암 부조 (곡괭이)", + "block.mineralogy.gabbro_relief_plus": "반려암 부조 (더하기 기호)", + "block.mineralogy.gabbro_relief_right": "반려암 부조 (오른쪽)", + "block.mineralogy.gabbro_relief_sword": "반려암 부조 (검)", + "block.mineralogy.gabbro_relief_vertical": "반려암 부조 (세로)", + "block.mineralogy.peridotite_relief_axe": "감람암 부조 (도끼)", + "block.mineralogy.peridotite_relief_blank": "감람암 부조 (무늬 없음)", + "block.mineralogy.peridotite_relief_cross": "감람암 부조 (십자)", + "block.mineralogy.peridotite_relief_hammer": "감람암 부조 (망치)", + "block.mineralogy.peridotite_relief_hoe": "감람암 부조 (괭이)", + "block.mineralogy.peridotite_relief_horizontal": "감람암 부조 (가로)", + "block.mineralogy.peridotite_relief_i": "감람암 부조 (I)", + "block.mineralogy.peridotite_relief_left": "감람암 부조 (왼쪽)", + "block.mineralogy.peridotite_relief_pickaxe": "감람암 부조 (곡괭이)", + "block.mineralogy.peridotite_relief_plus": "감람암 부조 (더하기 기호)", + "block.mineralogy.peridotite_relief_right": "감람암 부조 (오른쪽)", + "block.mineralogy.peridotite_relief_sword": "감람암 부조 (검)", + "block.mineralogy.peridotite_relief_vertical": "감람암 부조 (세로)", + "block.mineralogy.basaltic_glass_relief_axe": "현무암질 유리 부조 (도끼)", + "block.mineralogy.basaltic_glass_relief_blank": "현무암질 유리 부조 (무늬 없음)", + "block.mineralogy.basaltic_glass_relief_cross": "현무암질 유리 부조 (십자)", + "block.mineralogy.basaltic_glass_relief_hammer": "현무암질 유리 부조 (망치)", + "block.mineralogy.basaltic_glass_relief_hoe": "현무암질 유리 부조 (괭이)", + "block.mineralogy.basaltic_glass_relief_horizontal": "현무암질 유리 부조 (가로)", + "block.mineralogy.basaltic_glass_relief_i": "현무암질 유리 부조 (I)", + "block.mineralogy.basaltic_glass_relief_left": "현무암질 유리 부조 (왼쪽)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "현무암질 유리 부조 (곡괭이)", + "block.mineralogy.basaltic_glass_relief_plus": "현무암질 유리 부조 (더하기 기호)", + "block.mineralogy.basaltic_glass_relief_right": "현무암질 유리 부조 (오른쪽)", + "block.mineralogy.basaltic_glass_relief_sword": "현무암질 유리 부조 (검)", + "block.mineralogy.basaltic_glass_relief_vertical": "현무암질 유리 부조 (세로)", + "block.mineralogy.scoria_relief_axe": "스코리아 부조 (도끼)", + "block.mineralogy.scoria_relief_blank": "스코리아 부조 (무늬 없음)", + "block.mineralogy.scoria_relief_cross": "스코리아 부조 (십자)", + "block.mineralogy.scoria_relief_hammer": "스코리아 부조 (망치)", + "block.mineralogy.scoria_relief_hoe": "스코리아 부조 (괭이)", + "block.mineralogy.scoria_relief_horizontal": "스코리아 부조 (가로)", + "block.mineralogy.scoria_relief_i": "스코리아 부조 (I)", + "block.mineralogy.scoria_relief_left": "스코리아 부조 (왼쪽)", + "block.mineralogy.scoria_relief_pickaxe": "스코리아 부조 (곡괭이)", + "block.mineralogy.scoria_relief_plus": "스코리아 부조 (더하기 기호)", + "block.mineralogy.scoria_relief_right": "스코리아 부조 (오른쪽)", + "block.mineralogy.scoria_relief_sword": "스코리아 부조 (검)", + "block.mineralogy.scoria_relief_vertical": "스코리아 부조 (세로)", + "block.mineralogy.tuff_relief_axe": "응회암 부조 (도끼)", + "block.mineralogy.tuff_relief_blank": "응회암 부조 (무늬 없음)", + "block.mineralogy.tuff_relief_cross": "응회암 부조 (십자)", + "block.mineralogy.tuff_relief_hammer": "응회암 부조 (망치)", + "block.mineralogy.tuff_relief_hoe": "응회암 부조 (괭이)", + "block.mineralogy.tuff_relief_horizontal": "응회암 부조 (가로)", + "block.mineralogy.tuff_relief_i": "응회암 부조 (I)", + "block.mineralogy.tuff_relief_left": "응회암 부조 (왼쪽)", + "block.mineralogy.tuff_relief_pickaxe": "응회암 부조 (곡괭이)", + "block.mineralogy.tuff_relief_plus": "응회암 부조 (더하기 기호)", + "block.mineralogy.tuff_relief_right": "응회암 부조 (오른쪽)", + "block.mineralogy.tuff_relief_sword": "응회암 부조 (검)", + "block.mineralogy.tuff_relief_vertical": "응회암 부조 (세로)", + "block.mineralogy.siltstone_relief_axe": "미사암 부조 (도끼)", + "block.mineralogy.siltstone_relief_blank": "미사암 부조 (무늬 없음)", + "block.mineralogy.siltstone_relief_cross": "미사암 부조 (십자)", + "block.mineralogy.siltstone_relief_hammer": "미사암 부조 (망치)", + "block.mineralogy.siltstone_relief_hoe": "미사암 부조 (괭이)", + "block.mineralogy.siltstone_relief_horizontal": "미사암 부조 (가로)", + "block.mineralogy.siltstone_relief_i": "미사암 부조 (I)", + "block.mineralogy.siltstone_relief_left": "미사암 부조 (왼쪽)", + "block.mineralogy.siltstone_relief_pickaxe": "미사암 부조 (곡괭이)", + "block.mineralogy.siltstone_relief_plus": "미사암 부조 (더하기 기호)", + "block.mineralogy.siltstone_relief_right": "미사암 부조 (오른쪽)", + "block.mineralogy.siltstone_relief_sword": "미사암 부조 (검)", + "block.mineralogy.siltstone_relief_vertical": "미사암 부조 (세로)", + "block.mineralogy.rock_salt_relief_axe": "암염 부조 (도끼)", + "block.mineralogy.rock_salt_relief_blank": "암염 부조 (무늬 없음)", + "block.mineralogy.rock_salt_relief_cross": "암염 부조 (십자)", + "block.mineralogy.rock_salt_relief_hammer": "암염 부조 (망치)", + "block.mineralogy.rock_salt_relief_hoe": "암염 부조 (괭이)", + "block.mineralogy.rock_salt_relief_horizontal": "암염 부조 (가로)", + "block.mineralogy.rock_salt_relief_i": "암염 부조 (I)", + "block.mineralogy.rock_salt_relief_left": "암염 부조 (왼쪽)", + "block.mineralogy.rock_salt_relief_pickaxe": "암염 부조 (곡괭이)", + "block.mineralogy.rock_salt_relief_plus": "암염 부조 (더하기 기호)", + "block.mineralogy.rock_salt_relief_right": "암염 부조 (오른쪽)", + "block.mineralogy.rock_salt_relief_sword": "암염 부조 (검)", + "block.mineralogy.rock_salt_relief_vertical": "암염 부조 (세로)", + "block.mineralogy.hornfels_relief_axe": "혼펠스 부조 (도끼)", + "block.mineralogy.hornfels_relief_blank": "혼펠스 부조 (무늬 없음)", + "block.mineralogy.hornfels_relief_cross": "혼펠스 부조 (십자)", + "block.mineralogy.hornfels_relief_hammer": "혼펠스 부조 (망치)", + "block.mineralogy.hornfels_relief_hoe": "혼펠스 부조 (괭이)", + "block.mineralogy.hornfels_relief_horizontal": "혼펠스 부조 (가로)", + "block.mineralogy.hornfels_relief_i": "혼펠스 부조 (I)", + "block.mineralogy.hornfels_relief_left": "혼펠스 부조 (왼쪽)", + "block.mineralogy.hornfels_relief_pickaxe": "혼펠스 부조 (곡괭이)", + "block.mineralogy.hornfels_relief_plus": "혼펠스 부조 (더하기 기호)", + "block.mineralogy.hornfels_relief_right": "혼펠스 부조 (오른쪽)", + "block.mineralogy.hornfels_relief_sword": "혼펠스 부조 (검)", + "block.mineralogy.hornfels_relief_vertical": "혼펠스 부조 (세로)", + "block.mineralogy.quartzite_relief_axe": "규암 부조 (도끼)", + "block.mineralogy.quartzite_relief_blank": "규암 부조 (무늬 없음)", + "block.mineralogy.quartzite_relief_cross": "규암 부조 (십자)", + "block.mineralogy.quartzite_relief_hammer": "규암 부조 (망치)", + "block.mineralogy.quartzite_relief_hoe": "규암 부조 (괭이)", + "block.mineralogy.quartzite_relief_horizontal": "규암 부조 (가로)", + "block.mineralogy.quartzite_relief_i": "규암 부조 (I)", + "block.mineralogy.quartzite_relief_left": "규암 부조 (왼쪽)", + "block.mineralogy.quartzite_relief_pickaxe": "규암 부조 (곡괭이)", + "block.mineralogy.quartzite_relief_plus": "규암 부조 (더하기 기호)", + "block.mineralogy.quartzite_relief_right": "규암 부조 (오른쪽)", + "block.mineralogy.quartzite_relief_sword": "규암 부조 (검)", + "block.mineralogy.quartzite_relief_vertical": "규암 부조 (세로)", + "block.mineralogy.novaculite_relief_axe": "노바큘라이트 부조 (도끼)", + "block.mineralogy.novaculite_relief_blank": "노바큘라이트 부조 (무늬 없음)", + "block.mineralogy.novaculite_relief_cross": "노바큘라이트 부조 (십자)", + "block.mineralogy.novaculite_relief_hammer": "노바큘라이트 부조 (망치)", + "block.mineralogy.novaculite_relief_hoe": "노바큘라이트 부조 (괭이)", + "block.mineralogy.novaculite_relief_horizontal": "노바큘라이트 부조 (가로)", + "block.mineralogy.novaculite_relief_i": "노바큘라이트 부조 (I)", + "block.mineralogy.novaculite_relief_left": "노바큘라이트 부조 (왼쪽)", + "block.mineralogy.novaculite_relief_pickaxe": "노바큘라이트 부조 (곡괭이)", + "block.mineralogy.novaculite_relief_plus": "노바큘라이트 부조 (더하기 기호)", + "block.mineralogy.novaculite_relief_right": "노바큘라이트 부조 (오른쪽)", + "block.mineralogy.novaculite_relief_sword": "노바큘라이트 부조 (검)", + "block.mineralogy.novaculite_relief_vertical": "노바큘라이트 부조 (세로)", "itemGroup.mineralogy.mineralogy": "광물학", "itemGroup.mineralogy.rock": "광물학 암석", "itemGroup.mineralogy.stair": "광물학 계단", - "itemGroup.mineralogy.slab": "광물학 석판", - "itemGroup.mineralogy.wall": "광물학 벽", - "itemGroup.mineralogy.item": "광물학 아이템" + "itemGroup.mineralogy.slab": "광물학 반 블록", + "itemGroup.mineralogy.wall": "광물학 담장", + "itemGroup.mineralogy.item": "광물학 아이템", + "block.mineralogy.crude_oil": "원유", + "item.mineralogy.crude_oil_bucket": "원유 양동이", + "fluid.mineralogy.crude_oil": "원유", + "advancements.mineralogy.all_the_rocks.title": "모든 암석", + "advancements.mineralogy.all_the_rocks.description": "광물학의 모든 표준 암석을 찾았습니다!" } diff --git a/src/main/resources/assets/mineralogy/lang/pt_br.json b/src/main/resources/assets/mineralogy/lang/pt_br.json index 54b020e92..867e9ac0d 100644 --- a/src/main/resources/assets/mineralogy/lang/pt_br.json +++ b/src/main/resources/assets/mineralogy/lang/pt_br.json @@ -1,940 +1,940 @@ { "block.mineralogy.andesite": "Andesito", - "block.mineralogy.andesite_stairs": "Escadas Andesíticas", + "block.mineralogy.andesite_stairs": "Escadas de Andesito", "block.mineralogy.andesite_slab": "Laje de Andesito", - "block.mineralogy.andesite_brick": "Tijolo Andesito", - "block.mineralogy.andesite_brick_stairs": "Escadas de tijolos andesíticos", - "block.mineralogy.andesite_brick_slab": "Laje de tijolo de andesito", - "block.mineralogy.andesite_smooth": "Andesito Polido", - "block.mineralogy.andesite_smooth_stairs": "Escadas polidas de andesita", - "block.mineralogy.andesite_smooth_slab": "Laje polida de andesita", - "block.mineralogy.andesite_smooth_brick": "Tijolo Polido Andesito", - "block.mineralogy.andesite_smooth_brick_stairs": "Escadas de tijolo polido de andesita", - "block.mineralogy.andesite_smooth_brick_slab": "Laje de tijolo polido de andesita", + "block.mineralogy.andesite_brick": "Tijolos de Andesito", + "block.mineralogy.andesite_brick_stairs": "Escadas de tijolos de Andesito", + "block.mineralogy.andesite_brick_slab": "Laje de tijolos de Andesito", + "block.mineralogy.andesite_smooth": "Bloco polido de Andesito", + "block.mineralogy.andesite_smooth_stairs": "Escadas polidas de Andesito", + "block.mineralogy.andesite_smooth_slab": "Laje polida de Andesito", + "block.mineralogy.andesite_smooth_brick": "Tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_stairs": "Escadas de tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_slab": "Laje de tijolos polidos de Andesito", "block.mineralogy.basalt": "Basalto", "block.mineralogy.basalt_stairs": "Escadas de Basalto", - "block.mineralogy.basalt_slab": "Laje de basalto", - "block.mineralogy.basalt_brick": "Tijolo Basáltico", - "block.mineralogy.basalt_brick_stairs": "Escadas de tijolos basálticos", - "block.mineralogy.basalt_brick_slab": "Laje de tijolo basáltico", - "block.mineralogy.basalt_smooth": "Basalto Polido", - "block.mineralogy.basalt_smooth_stairs": "Escadas polidas em basalto", - "block.mineralogy.basalt_smooth_slab": "Laje polida de basalto", - "block.mineralogy.basalt_smooth_brick": "Tijolo polido de basalto", - "block.mineralogy.basalt_smooth_brick_stairs": "Escadas de tijolo polido de basalto", - "block.mineralogy.basalt_smooth_brick_slab": "Laje de tijolo polido de basalto", + "block.mineralogy.basalt_slab": "Laje de Basalto", + "block.mineralogy.basalt_brick": "Tijolos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escadas de tijolos de Basalto", + "block.mineralogy.basalt_brick_slab": "Laje de tijolos de Basalto", + "block.mineralogy.basalt_smooth": "Bloco polido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escadas polidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Laje polida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escadas de tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Laje de tijolos polidos de Basalto", "block.mineralogy.diorite": "Diorito", "block.mineralogy.diorite_stairs": "Escadas de Diorito", "block.mineralogy.diorite_slab": "Laje de Diorito", - "block.mineralogy.diorite_brick": "Tijolo Diorito", - "block.mineralogy.diorite_brick_stairs": "Escadas de tijolos de diorito", - "block.mineralogy.diorite_brick_slab": "Laje de tijolo de diorito", - "block.mineralogy.diorite_smooth": "Diorito Polido", - "block.mineralogy.diorite_smooth_stairs": "Escadas Polidas Diorito", - "block.mineralogy.diorite_smooth_slab": "Laje polida de diorito", - "block.mineralogy.diorite_smooth_brick": "Tijolo Polido Diorito", - "block.mineralogy.diorite_smooth_brick_stairs": "Escadas de tijolo polido de diorito", - "block.mineralogy.diorite_smooth_brick_slab": "Laje de tijolo polido de diorito", + "block.mineralogy.diorite_brick": "Tijolos de Diorito", + "block.mineralogy.diorite_brick_stairs": "Escadas de tijolos de Diorito", + "block.mineralogy.diorite_brick_slab": "Laje de tijolos de Diorito", + "block.mineralogy.diorite_smooth": "Bloco polido de Diorito", + "block.mineralogy.diorite_smooth_stairs": "Escadas polidas de Diorito", + "block.mineralogy.diorite_smooth_slab": "Laje polida de Diorito", + "block.mineralogy.diorite_smooth_brick": "Tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_stairs": "Escadas de tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_slab": "Laje de tijolos polidos de Diorito", "block.mineralogy.granite": "Granito", "block.mineralogy.granite_stairs": "Escadas de Granito", - "block.mineralogy.granite_slab": "Laje de granito", - "block.mineralogy.granite_brick": "Tijolo de Granito", - "block.mineralogy.granite_brick_stairs": "Escadas de tijolo de granito", - "block.mineralogy.granite_brick_slab": "Laje de tijolo de granito", - "block.mineralogy.granite_smooth": "Granito Polido", - "block.mineralogy.granite_smooth_stairs": "Escadas Polidas em Granito", - "block.mineralogy.granite_smooth_slab": "Laje Polida de Granito", - "block.mineralogy.granite_smooth_brick": "Tijolo polido de granito", - "block.mineralogy.granite_smooth_brick_stairs": "Escadas de tijolo polido em granito", - "block.mineralogy.granite_smooth_brick_slab": "Laje de tijolo polido de granito", + "block.mineralogy.granite_slab": "Laje de Granito", + "block.mineralogy.granite_brick": "Tijolos de Granito", + "block.mineralogy.granite_brick_stairs": "Escadas de tijolos de Granito", + "block.mineralogy.granite_brick_slab": "Laje de tijolos de Granito", + "block.mineralogy.granite_smooth": "Bloco polido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escadas polidas de Granito", + "block.mineralogy.granite_smooth_slab": "Laje polida de Granito", + "block.mineralogy.granite_smooth_brick": "Tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escadas de tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Laje de tijolos polidos de Granito", "block.mineralogy.rhyolite": "Riolito", - "block.mineralogy.rhyolite_stairs": "Escadas de riolito", + "block.mineralogy.rhyolite_stairs": "Escadas de Riolito", "block.mineralogy.rhyolite_slab": "Laje de Riolito", - "block.mineralogy.rhyolite_brick": "Tijolo Riolito", - "block.mineralogy.rhyolite_brick_stairs": "Escadas de tijolo riolito", - "block.mineralogy.rhyolite_brick_slab": "Laje de tijolo riolito", - "block.mineralogy.rhyolite_smooth": "Riolito Polido", - "block.mineralogy.rhyolite_smooth_stairs": "Escadas Polidas Riolita", - "block.mineralogy.rhyolite_smooth_slab": "Laje polida de riolito", - "block.mineralogy.rhyolite_smooth_brick": "Tijolo Polido Riolito", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escadas de tijolo polido riolito", - "block.mineralogy.rhyolite_smooth_brick_slab": "Laje de tijolo polido riolito", + "block.mineralogy.rhyolite_brick": "Tijolos de Riolito", + "block.mineralogy.rhyolite_brick_stairs": "Escadas de tijolos de Riolito", + "block.mineralogy.rhyolite_brick_slab": "Laje de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth": "Bloco polido de Riolito", + "block.mineralogy.rhyolite_smooth_stairs": "Escadas polidas de Riolito", + "block.mineralogy.rhyolite_smooth_slab": "Laje polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick": "Tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escadas de tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_slab": "Laje de tijolos polidos de Riolito", "block.mineralogy.pegmatite": "Pegmatito", - "block.mineralogy.pegmatite_stairs": "Escadas Pegmatíticas", - "block.mineralogy.pegmatite_slab": "Laje de Pegmatita", - "block.mineralogy.pegmatite_brick": "Tijolo Pegmatito", - "block.mineralogy.pegmatite_brick_stairs": "Escadas de tijolo pegmatita", - "block.mineralogy.pegmatite_brick_slab": "Laje de tijolo pegmatita", - "block.mineralogy.pegmatite_smooth": "Pegmatito Polido", - "block.mineralogy.pegmatite_smooth_stairs": "Escadas Polidas Pegmatita", - "block.mineralogy.pegmatite_smooth_slab": "Laje polida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick": "Tijolo Polido Pegmatita", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escadas de tijolo polido de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_slab": "Laje de tijolo polido de pegmatita", - "block.mineralogy.shale": "Xisto", - "block.mineralogy.shale_stairs": "Escadas de Xisto", - "block.mineralogy.shale_slab": "Laje de xisto", - "block.mineralogy.shale_brick": "Tijolo de Xisto", - "block.mineralogy.shale_brick_stairs": "Escadas de tijolo de xisto", - "block.mineralogy.shale_brick_slab": "Laje de tijolo de xisto", - "block.mineralogy.shale_smooth": "Xisto Polido", - "block.mineralogy.shale_smooth_stairs": "Escadas de Xisto Polido", - "block.mineralogy.shale_smooth_slab": "Laje Polida de Xisto", - "block.mineralogy.shale_smooth_brick": "Tijolo polido de xisto", - "block.mineralogy.shale_smooth_brick_stairs": "Escadas de tijolo polido de xisto", - "block.mineralogy.shale_smooth_brick_slab": "Laje de tijolo polido de xisto", + "block.mineralogy.pegmatite_stairs": "Escadas de Pegmatito", + "block.mineralogy.pegmatite_slab": "Laje de Pegmatito", + "block.mineralogy.pegmatite_brick": "Tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_stairs": "Escadas de tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_slab": "Laje de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth": "Bloco polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_stairs": "Escadas polidas de Pegmatito", + "block.mineralogy.pegmatite_smooth_slab": "Laje polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick": "Tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escadas de tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_slab": "Laje de tijolos polidos de Pegmatito", + "block.mineralogy.shale": "Folhelho", + "block.mineralogy.shale_stairs": "Escadas de Folhelho", + "block.mineralogy.shale_slab": "Laje de Folhelho", + "block.mineralogy.shale_brick": "Tijolos de Folhelho", + "block.mineralogy.shale_brick_stairs": "Escadas de tijolos de Folhelho", + "block.mineralogy.shale_brick_slab": "Laje de tijolos de Folhelho", + "block.mineralogy.shale_smooth": "Bloco polido de Folhelho", + "block.mineralogy.shale_smooth_stairs": "Escadas polidas de Folhelho", + "block.mineralogy.shale_smooth_slab": "Laje polida de Folhelho", + "block.mineralogy.shale_smooth_brick": "Tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_stairs": "Escadas de tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_slab": "Laje de tijolos polidos de Folhelho", "block.mineralogy.conglomerate": "Conglomerado", - "block.mineralogy.conglomerate_stairs": "Escadas Conglomeradas", - "block.mineralogy.conglomerate_slab": "Laje Conglomerada", - "block.mineralogy.conglomerate_brick": "Tijolo Conglomerado", - "block.mineralogy.conglomerate_brick_stairs": "Escadas de tijolos conglomerados", - "block.mineralogy.conglomerate_brick_slab": "Laje de Tijolo Conglomerado", - "block.mineralogy.conglomerate_smooth": "Conglomerado Polido", - "block.mineralogy.conglomerate_smooth_stairs": "Escadas Polidas Conglomeradas", - "block.mineralogy.conglomerate_smooth_slab": "Laje Polida Conglomerada", - "block.mineralogy.conglomerate_smooth_brick": "Tijolo Polido Conglomerado", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Escadas de tijolo polido conglomerado", - "block.mineralogy.conglomerate_smooth_brick_slab": "Laje de tijolo polido conglomerado", + "block.mineralogy.conglomerate_stairs": "Escadas de Conglomerado", + "block.mineralogy.conglomerate_slab": "Laje de Conglomerado", + "block.mineralogy.conglomerate_brick": "Tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escadas de tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Laje de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloco polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escadas polidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Laje polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escadas de tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Laje de tijolos polidos de Conglomerado", "block.mineralogy.dolomite": "Dolomita", - "block.mineralogy.dolomite_stairs": "Escadas Dolomitas", - "block.mineralogy.dolomite_slab": "Laje Dolomita", - "block.mineralogy.dolomite_brick": "Tijolo Dolomita", - "block.mineralogy.dolomite_brick_stairs": "Escadas de tijolos dolomitas", - "block.mineralogy.dolomite_brick_slab": "Laje de tijolo de dolomita", - "block.mineralogy.dolomite_smooth": "Dolomita Polida", - "block.mineralogy.dolomite_smooth_stairs": "Escadas polidas em dolomita", - "block.mineralogy.dolomite_smooth_slab": "Laje Polida Dolomita", - "block.mineralogy.dolomite_smooth_brick": "Tijolo Dolomita Polido", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escadas de tijolo polido em dolomita", - "block.mineralogy.dolomite_smooth_brick_slab": "Laje de tijolo polido dolomita", + "block.mineralogy.dolomite_stairs": "Escadas de Dolomita", + "block.mineralogy.dolomite_slab": "Laje de Dolomita", + "block.mineralogy.dolomite_brick": "Tijolos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escadas de tijolos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Laje de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloco polido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escadas polidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Laje polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escadas de tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Laje de tijolos polidos de Dolomita", "block.mineralogy.limestone": "Calcário", - "block.mineralogy.limestone_stairs": "Escadas de calcário", - "block.mineralogy.limestone_slab": "Laje de calcário", - "block.mineralogy.limestone_brick": "Tijolo de calcário", - "block.mineralogy.limestone_brick_stairs": "Escadas de tijolos de calcário", - "block.mineralogy.limestone_brick_slab": "Laje de tijolo de calcário", - "block.mineralogy.limestone_smooth": "Calcário Polido", - "block.mineralogy.limestone_smooth_stairs": "Escadas polidas em pedra calcária", - "block.mineralogy.limestone_smooth_slab": "Laje polida de calcário", - "block.mineralogy.limestone_smooth_brick": "Tijolo polido de calcário", - "block.mineralogy.limestone_smooth_brick_stairs": "Escadas de tijolo polido de calcário", - "block.mineralogy.limestone_smooth_brick_slab": "Laje de tijolo polido de calcário", + "block.mineralogy.limestone_stairs": "Escadas de Calcário", + "block.mineralogy.limestone_slab": "Laje de Calcário", + "block.mineralogy.limestone_brick": "Tijolos de Calcário", + "block.mineralogy.limestone_brick_stairs": "Escadas de tijolos de Calcário", + "block.mineralogy.limestone_brick_slab": "Laje de tijolos de Calcário", + "block.mineralogy.limestone_smooth": "Bloco polido de Calcário", + "block.mineralogy.limestone_smooth_stairs": "Escadas polidas de Calcário", + "block.mineralogy.limestone_smooth_slab": "Laje polida de Calcário", + "block.mineralogy.limestone_smooth_brick": "Tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_stairs": "Escadas de tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_slab": "Laje de tijolos polidos de Calcário", "block.mineralogy.slate": "Ardósia", - "block.mineralogy.slate_stairs": "Escadas de ardósia", - "block.mineralogy.slate_slab": "Laje de ardósia", - "block.mineralogy.slate_brick": "Tijolo de ardósia", - "block.mineralogy.slate_brick_stairs": "Escadas de tijolos de ardósia", - "block.mineralogy.slate_brick_slab": "Laje de tijolo de ardósia", - "block.mineralogy.slate_smooth": "Ardósia Polida", - "block.mineralogy.slate_smooth_stairs": "Escadas de ardósia polida", - "block.mineralogy.slate_smooth_slab": "Laje polida de ardósia", - "block.mineralogy.slate_smooth_brick": "Tijolo polido de ardósia", - "block.mineralogy.slate_smooth_brick_stairs": "Escadas de tijolo polido de ardósia", - "block.mineralogy.slate_smooth_brick_slab": "Laje de tijolo polido de ardósia", + "block.mineralogy.slate_stairs": "Escadas de Ardósia", + "block.mineralogy.slate_slab": "Laje de Ardósia", + "block.mineralogy.slate_brick": "Tijolos de Ardósia", + "block.mineralogy.slate_brick_stairs": "Escadas de tijolos de Ardósia", + "block.mineralogy.slate_brick_slab": "Laje de tijolos de Ardósia", + "block.mineralogy.slate_smooth": "Bloco polido de Ardósia", + "block.mineralogy.slate_smooth_stairs": "Escadas polidas de Ardósia", + "block.mineralogy.slate_smooth_slab": "Laje polida de Ardósia", + "block.mineralogy.slate_smooth_brick": "Tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_stairs": "Escadas de tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_slab": "Laje de tijolos polidos de Ardósia", "block.mineralogy.schist": "Xisto", "block.mineralogy.schist_stairs": "Escadas de Xisto", "block.mineralogy.schist_slab": "Laje de Xisto", - "block.mineralogy.schist_brick": "Tijolo de Xisto", - "block.mineralogy.schist_brick_stairs": "Escadas em tijolo de xisto", - "block.mineralogy.schist_brick_slab": "Laje de tijolo de xisto", - "block.mineralogy.schist_smooth": "Xisto Polido", - "block.mineralogy.schist_smooth_stairs": "Escadas em Xisto Polido", - "block.mineralogy.schist_smooth_slab": "Laje de Xisto Polido", - "block.mineralogy.schist_smooth_brick": "Tijolo Polido de Xisto", - "block.mineralogy.schist_smooth_brick_stairs": "Escadas em Tijolo Polido de Xisto", - "block.mineralogy.schist_smooth_brick_slab": "Laje de tijolo polido de xisto", + "block.mineralogy.schist_brick": "Tijolos de Xisto", + "block.mineralogy.schist_brick_stairs": "Escadas de tijolos de Xisto", + "block.mineralogy.schist_brick_slab": "Laje de tijolos de Xisto", + "block.mineralogy.schist_smooth": "Bloco polido de Xisto", + "block.mineralogy.schist_smooth_stairs": "Escadas polidas de Xisto", + "block.mineralogy.schist_smooth_slab": "Laje polida de Xisto", + "block.mineralogy.schist_smooth_brick": "Tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escadas de tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_slab": "Laje de tijolos polidos de Xisto", "block.mineralogy.gneiss": "Gnaisse", "block.mineralogy.gneiss_stairs": "Escadas de Gnaisse", "block.mineralogy.gneiss_slab": "Laje de Gnaisse", - "block.mineralogy.gneiss_brick": "Tijolo Gnaisse", - "block.mineralogy.gneiss_brick_stairs": "Escadas de tijolos de gnaisse", - "block.mineralogy.gneiss_brick_slab": "Laje de tijolo de gnaisse", - "block.mineralogy.gneiss_smooth": "Gnaisse Polido", - "block.mineralogy.gneiss_smooth_stairs": "Escadas Polidas em Gnaisse", - "block.mineralogy.gneiss_smooth_slab": "Laje polida de gnaisse", - "block.mineralogy.gneiss_smooth_brick": "Tijolo Polido Gnaisse", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escadas de tijolo polido de gnaisse", - "block.mineralogy.gneiss_smooth_brick_slab": "Laje de tijolo polido de gnaisse", + "block.mineralogy.gneiss_brick": "Tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_stairs": "Escadas de tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_slab": "Laje de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth": "Bloco polido de Gnaisse", + "block.mineralogy.gneiss_smooth_stairs": "Escadas polidas de Gnaisse", + "block.mineralogy.gneiss_smooth_slab": "Laje polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick": "Tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escadas de tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_slab": "Laje de tijolos polidos de Gnaisse", "block.mineralogy.marble": "Mármore", "block.mineralogy.marble_stairs": "Escadas de Mármore", - "block.mineralogy.marble_slab": "Laje de mármore", - "block.mineralogy.marble_brick": "Tijolo de Mármore", - "block.mineralogy.marble_brick_stairs": "Escadas de tijolos de mármore", - "block.mineralogy.marble_brick_slab": "Laje de tijolo de mármore", - "block.mineralogy.marble_smooth": "Mármore Polido", - "block.mineralogy.marble_smooth_stairs": "Escadas polidas em mármore", - "block.mineralogy.marble_smooth_slab": "Laje polida de mármore", - "block.mineralogy.marble_smooth_brick": "Tijolo polido de mármore", - "block.mineralogy.marble_smooth_brick_stairs": "Escadas de tijolo polido em mármore", - "block.mineralogy.marble_smooth_brick_slab": "Laje de tijolo polido em mármore", + "block.mineralogy.marble_slab": "Laje de Mármore", + "block.mineralogy.marble_brick": "Tijolos de Mármore", + "block.mineralogy.marble_brick_stairs": "Escadas de tijolos de Mármore", + "block.mineralogy.marble_brick_slab": "Laje de tijolos de Mármore", + "block.mineralogy.marble_smooth": "Bloco polido de Mármore", + "block.mineralogy.marble_smooth_stairs": "Escadas polidas de Mármore", + "block.mineralogy.marble_smooth_slab": "Laje polida de Mármore", + "block.mineralogy.marble_smooth_brick": "Tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_stairs": "Escadas de tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_slab": "Laje de tijolos polidos de Mármore", "block.mineralogy.phyllite": "Filito", - "block.mineralogy.phyllite_stairs": "Escadas de filito", - "block.mineralogy.phyllite_slab": "Laje de filito", - "block.mineralogy.phyllite_brick": "Tijolo Filito", - "block.mineralogy.phyllite_brick_stairs": "Escadas de tijolo filito", - "block.mineralogy.phyllite_brick_slab": "Laje de tijolo filito", - "block.mineralogy.phyllite_smooth": "Filito Polido", - "block.mineralogy.phyllite_smooth_stairs": "Escadas polidas de filito", - "block.mineralogy.phyllite_smooth_slab": "Laje polida de filito", - "block.mineralogy.phyllite_smooth_brick": "Tijolo polido filito", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escadas de tijolo polido filito", - "block.mineralogy.phyllite_smooth_brick_slab": "Laje de tijolo polido filito", + "block.mineralogy.phyllite_stairs": "Escadas de Filito", + "block.mineralogy.phyllite_slab": "Laje de Filito", + "block.mineralogy.phyllite_brick": "Tijolos de Filito", + "block.mineralogy.phyllite_brick_stairs": "Escadas de tijolos de Filito", + "block.mineralogy.phyllite_brick_slab": "Laje de tijolos de Filito", + "block.mineralogy.phyllite_smooth": "Bloco polido de Filito", + "block.mineralogy.phyllite_smooth_stairs": "Escadas polidas de Filito", + "block.mineralogy.phyllite_smooth_slab": "Laje polida de Filito", + "block.mineralogy.phyllite_smooth_brick": "Tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escadas de tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_slab": "Laje de tijolos polidos de Filito", "block.mineralogy.amphibolite": "Anfibolito", - "block.mineralogy.amphibolite_stairs": "Escadas Anfibolitas", - "block.mineralogy.amphibolite_slab": "Laje Anfibolito", - "block.mineralogy.amphibolite_brick": "Tijolo Anfibolito", - "block.mineralogy.amphibolite_brick_stairs": "Escadas de tijolo anfibolito", - "block.mineralogy.amphibolite_brick_slab": "Laje de tijolo anfibolito", - "block.mineralogy.amphibolite_smooth": "SuaveAnfibolito", - "block.mineralogy.amphibolite_smooth_stairs": "Escadas Polidas Anfibolito", - "block.mineralogy.amphibolite_smooth_slab": "Laje Polida Anfibolito", - "block.mineralogy.amphibolite_smooth_brick": "Tijolo Polido Anfibolito", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escadas de tijolo polido anfibolito", - "block.mineralogy.amphibolite_smooth_brick_slab": "Laje de tijolo polido anfibolito", - "item.mineralogy.gypsum_dust": "Gesso em Pó", - "item.mineralogy.sulfur_dust": "Enxofre em Pó", + "block.mineralogy.amphibolite_stairs": "Escadas de Anfibolito", + "block.mineralogy.amphibolite_slab": "Laje de Anfibolito", + "block.mineralogy.amphibolite_brick": "Tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_stairs": "Escadas de tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_slab": "Laje de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth": "Bloco polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_stairs": "Escadas polidas de Anfibolito", + "block.mineralogy.amphibolite_smooth_slab": "Laje polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick": "Tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escadas de tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_slab": "Laje de tijolos polidos de Anfibolito", + "item.mineralogy.gypsum_dust": "Pó de gesso", + "item.mineralogy.sulfur_dust": "Pó de enxofre", "item.mineralogy.phosphorous_dust": "Pó de fósforo", - "item.mineralogy.nitrate_dust": "Nitrato em pó", - "item.mineralogy.mineral_fertilizer": "Fertilizante Mineral", - "block.mineralogy.chert": "Chert", + "item.mineralogy.nitrate_dust": "Pó de nitrato", + "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", + "block.mineralogy.chert": "Sílex", "block.mineralogy.gypsum": "Gesso", "block.mineralogy.pumice": "Pedra-pomes", "block.mineralogy.sulfur_block": "Enxofre", - "block.mineralogy.sulfur_ore": "Minério de Enxofre", + "block.mineralogy.sulfur_ore": "Minério de enxofre", "block.mineralogy.phosphorous_block": "Fósforo", "block.mineralogy.phosphorous_ore": "Minério de fósforo", "block.mineralogy.nitrate_block": "Nitrato", "block.mineralogy.nitrate_ore": "Minério de nitrato", - "block.mineralogy.drywall_black": "Drywall preto", - "block.mineralogy.drywall_red": "Drywall vermelho", - "block.mineralogy.drywall_green": "Drywall Verde", - "block.mineralogy.drywall_brown": "Drywall marrom", - "block.mineralogy.drywall_blue": "Drywall Azul", - "block.mineralogy.drywall_purple": "Drywall roxo", - "block.mineralogy.drywall_cyan": "Drywall Ciano", - "block.mineralogy.drywall_silver": "Drywall cinza claro", - "block.mineralogy.drywall_gray": "Drywall cinza", - "block.mineralogy.drywall_pink": "Drywall rosa", - "block.mineralogy.drywall_lime": "Drywall verde-limão", - "block.mineralogy.drywall_yellow": "Drywall Amarelo", - "block.mineralogy.drywall_light_blue": "Drywall azul claro", - "block.mineralogy.drywall_magenta": "Drywall magenta", - "block.mineralogy.drywall_orange": "Drywall Laranja", - "block.mineralogy.drywall_white": "Drywall branco", - "block.mineralogy.andesite_wall": "Muralha Andesítica", - "block.mineralogy.andesite_brick_wall": "Parede de tijolos de andesito", - "block.mineralogy.andesite_smooth_wall": "Parede polida de andesita", - "block.mineralogy.andesite_smooth_brick_wall": "Parede de tijolo polido de andesita", - "block.mineralogy.basalt_wall": "Parede de Basalto", - "block.mineralogy.basalt_brick_wall": "Parede de tijolos de basalto", - "block.mineralogy.basalt_smooth_wall": "Parede polida de basalto", - "block.mineralogy.basalt_smooth_brick_wall": "Parede de tijolo polido de basalto", - "block.mineralogy.diorite_wall": "Parede de Diorito", - "block.mineralogy.diorite_brick_wall": "Parede de tijolos de diorito", - "block.mineralogy.diorite_smooth_wall": "Parede Polida Diorito", - "block.mineralogy.diorite_smooth_brick_wall": "Parede de tijolo polido com diorito", - "block.mineralogy.granite_wall": "Parede de Granito", - "block.mineralogy.granite_brick_wall": "Parede de tijolos de granito", - "block.mineralogy.granite_smooth_wall": "Parede Polida em Granito", - "block.mineralogy.granite_smooth_brick_wall": "Parede de tijolo polido de granito", - "block.mineralogy.rhyolite_wall": "Parede de Riolito", - "block.mineralogy.rhyolite_brick_wall": "Parede de tijolos riolito", - "block.mineralogy.rhyolite_smooth_wall": "Parede Polida Riolita", - "block.mineralogy.rhyolite_smooth_brick_wall": "Parede de tijolo polido riolito", - "block.mineralogy.pegmatite_wall": "Parede Pegmatita", - "block.mineralogy.pegmatite_brick_wall": "Parede de tijolos pegmatita", - "block.mineralogy.pegmatite_smooth_wall": "Parede Polida Pegmatita", - "block.mineralogy.pegmatite_smooth_brick_wall": "Parede de tijolo polido de pegmatita", - "block.mineralogy.shale_wall": "Parede de Xisto", - "block.mineralogy.shale_brick_wall": "Parede de tijolos de xisto", - "block.mineralogy.shale_smooth_wall": "Parede polida de xisto", - "block.mineralogy.shale_smooth_brick_wall": "Parede de tijolo polido de xisto", - "block.mineralogy.conglomerate_wall": "Parede do Conglomerado", - "block.mineralogy.conglomerate_brick_wall": "Parede de tijolos conglomerados", - "block.mineralogy.conglomerate_smooth_wall": "Parede Polida Conglomerada", - "block.mineralogy.conglomerate_smooth_brick_wall": "Parede de tijolo polido conglomerado", - "block.mineralogy.dolomite_wall": "Muralha Dolomita", - "block.mineralogy.dolomite_brick_wall": "Parede de tijolos de dolomita", - "block.mineralogy.dolomite_smooth_wall": "Parede Polida Dolomita", - "block.mineralogy.dolomite_smooth_brick_wall": "Parede de tijolo polido dolomita", - "block.mineralogy.limestone_wall": "Parede de calcário", - "block.mineralogy.limestone_brick_wall": "Parede de tijolos de calcário", - "block.mineralogy.limestone_smooth_wall": "Parede polida de calcário", - "block.mineralogy.limestone_smooth_brick_wall": "Parede de tijolo polido de calcário", - "block.mineralogy.marble_wall": "Parede de Mármore", - "block.mineralogy.marble_brick_wall": "Parede de tijolos de mármore", - "block.mineralogy.marble_smooth_wall": "Parede polida de mármore", - "block.mineralogy.marble_smooth_brick_wall": "Parede de tijolo polido em mármore", - "block.mineralogy.slate_wall": "Parede de ardósia", - "block.mineralogy.slate_brick_wall": "Parede de tijolos de ardósia", - "block.mineralogy.slate_smooth_wall": "Parede polida de ardósia", - "block.mineralogy.slate_smooth_brick_wall": "Parede de tijolo polido de ardósia", - "block.mineralogy.schist_wall": "Parede de Xisto", - "block.mineralogy.schist_brick_wall": "Parede de Tijolos de Xisto", - "block.mineralogy.schist_smooth_wall": "Parede de Xisto Polido", - "block.mineralogy.schist_smooth_brick_wall": "Parede de tijolo polido de xisto", - "block.mineralogy.gneiss_wall": "Parede de Gnaisse", - "block.mineralogy.gneiss_brick_wall": "Parede de tijolos de gnaisse", - "block.mineralogy.gneiss_smooth_wall": "Parede Polida Gnaisse", - "block.mineralogy.gneiss_smooth_brick_wall": "Parede de tijolo polido de gnaisse", - "block.mineralogy.phyllite_wall": "Parede de filito", - "block.mineralogy.phyllite_brick_wall": "Parede de tijolo filito", - "block.mineralogy.phyllite_smooth_wall": "Parede Polida Filita", - "block.mineralogy.phyllite_smooth_brick_wall": "Parede de tijolo polido filito", - "block.mineralogy.amphibolite_wall": "Parede Anfibolito", - "block.mineralogy.amphibolite_brick_wall": "Parede de tijolos anfibolito", - "block.mineralogy.amphibolite_smooth_wall": "Parede Polida Anfibolito", - "block.mineralogy.amphibolite_smooth_brick_wall": "Parede de tijolo polido anfibolito", - "block.mineralogy.andesite_furnace": "Forno Andesito", - "block.mineralogy.andesite_brick_furnace": "Forno de tijolos andesíticos", - "block.mineralogy.andesite_smooth_furnace": "Forno polido de andesita", - "block.mineralogy.andesite_smooth_brick_furnace": "Forno de tijolo polido de andesita", - "block.mineralogy.basalt_furnace": "Forno de basalto", - "block.mineralogy.basalt_brick_furnace": "Forno de tijolos basálticos", - "block.mineralogy.basalt_smooth_furnace": "Forno Polido de Basalto", - "block.mineralogy.basalt_smooth_brick_furnace": "Forno de tijolo polido de basalto", - "block.mineralogy.diorite_furnace": "Forno de Diorito", - "block.mineralogy.diorite_brick_furnace": "Forno de tijolos de diorito", - "block.mineralogy.diorite_smooth_furnace": "Forno Polido Diorito", - "block.mineralogy.diorite_smooth_brick_furnace": "Forno de tijolo polido de diorito", - "block.mineralogy.granite_furnace": "Forno de granito", - "block.mineralogy.granite_brick_furnace": "Forno de tijolo de granito", - "block.mineralogy.granite_smooth_furnace": "Forno Polido de Granito", - "block.mineralogy.granite_smooth_brick_furnace": "Forno de tijolo polido de granito", - "block.mineralogy.rhyolite_furnace": "Forno de riolito", - "block.mineralogy.rhyolite_brick_furnace": "Forno de tijolo riolito", - "block.mineralogy.rhyolite_smooth_furnace": "Forno polido de riolito", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Forno de tijolo polido riolito", - "block.mineralogy.pegmatite_furnace": "Forno de Pegmatita", - "block.mineralogy.pegmatite_brick_furnace": "Forno de tijolos de pegmatita", - "block.mineralogy.pegmatite_smooth_furnace": "Forno Polido de Pegmatita", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Forno de tijolo polido de pegmatita", - "block.mineralogy.shale_furnace": "Forno de Xisto", - "block.mineralogy.shale_brick_furnace": "Forno de tijolo de xisto", - "block.mineralogy.shale_smooth_furnace": "Forno de xisto polido", - "block.mineralogy.shale_smooth_brick_furnace": "Forno de tijolo polido de xisto", - "block.mineralogy.conglomerate_furnace": "Forno Conglomerado", - "block.mineralogy.conglomerate_brick_furnace": "Forno de tijolos conglomerados", - "block.mineralogy.conglomerate_smooth_furnace": "Forno Polido Conglomerado", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Forno de tijolo polido conglomerado", - "block.mineralogy.dolomite_furnace": "Forno Dolomita", - "block.mineralogy.dolomite_brick_furnace": "Forno de tijolos dolomita", - "block.mineralogy.dolomite_smooth_furnace": "Forno Dolomita Polido", - "block.mineralogy.dolomite_smooth_brick_furnace": "Forno de tijolo polido dolomita", - "block.mineralogy.limestone_furnace": "Forno de calcário", - "block.mineralogy.limestone_brick_furnace": "Forno de tijolos de calcário", - "block.mineralogy.limestone_smooth_furnace": "Forno Polido de Calcário", - "block.mineralogy.limestone_smooth_brick_furnace": "Forno de tijolo polido de calcário", - "block.mineralogy.marble_furnace": "Forno de mármore", - "block.mineralogy.marble_brick_furnace": "Forno de tijolo de mármore", - "block.mineralogy.marble_smooth_furnace": "Forno Polido de Mármore", - "block.mineralogy.marble_smooth_brick_furnace": "Forno de tijolo polido em mármore", - "block.mineralogy.slate_furnace": "Forno de ardósia", - "block.mineralogy.slate_brick_furnace": "Forno de tijolo de ardósia", - "block.mineralogy.slate_smooth_furnace": "Forno de ardósia polida", - "block.mineralogy.slate_smooth_brick_furnace": "Forno de tijolo polido de ardósia", - "block.mineralogy.schist_furnace": "Forno de Xisto", - "block.mineralogy.schist_brick_furnace": "Forno de tijolo de xisto", - "block.mineralogy.schist_smooth_furnace": "Forno de Xisto Polido", - "block.mineralogy.schist_smooth_brick_furnace": "Forno de tijolo polido de xisto", - "block.mineralogy.gneiss_furnace": "Forno de Gnaisse", - "block.mineralogy.gneiss_brick_furnace": "Forno de tijolos de gnaisse", - "block.mineralogy.gneiss_smooth_furnace": "Forno Polido de Gnaisse", - "block.mineralogy.gneiss_smooth_brick_furnace": "Forno de tijolo polido de gnaisse", - "block.mineralogy.phyllite_furnace": "Forno de filito", - "block.mineralogy.phyllite_brick_furnace": "Forno de tijolo filito", - "block.mineralogy.phyllite_smooth_furnace": "Forno Polido Filito", - "block.mineralogy.phyllite_smooth_brick_furnace": "Forno de tijolo polido filito", - "block.mineralogy.amphibolite_furnace": "Forno Anfibolito", - "block.mineralogy.amphibolite_brick_furnace": "Forno de tijolo anfibolito", - "block.mineralogy.amphibolite_smooth_furnace": "Forno Polido Anfibolito", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Forno de tijolo polido anfibolito", + "block.mineralogy.drywall_black": "Placa de gesso preta", + "block.mineralogy.drywall_red": "Placa de gesso vermelha", + "block.mineralogy.drywall_green": "Placa de gesso verde", + "block.mineralogy.drywall_brown": "Placa de gesso marrom", + "block.mineralogy.drywall_blue": "Placa de gesso azul", + "block.mineralogy.drywall_purple": "Placa de gesso roxa", + "block.mineralogy.drywall_cyan": "Placa de gesso ciana", + "block.mineralogy.drywall_silver": "Placa de gesso cinza-clara", + "block.mineralogy.drywall_gray": "Placa de gesso cinza", + "block.mineralogy.drywall_pink": "Placa de gesso rosa", + "block.mineralogy.drywall_lime": "Placa de gesso verde-limão", + "block.mineralogy.drywall_yellow": "Placa de gesso amarela", + "block.mineralogy.drywall_light_blue": "Placa de gesso azul-clara", + "block.mineralogy.drywall_magenta": "Placa de gesso magenta", + "block.mineralogy.drywall_orange": "Placa de gesso laranja", + "block.mineralogy.drywall_white": "Placa de gesso branca", + "block.mineralogy.andesite_wall": "Muro de Andesito", + "block.mineralogy.andesite_brick_wall": "Muro de tijolos de Andesito", + "block.mineralogy.andesite_smooth_wall": "Muro polido de Andesito", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de tijolos polidos de Andesito", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de tijolos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro polido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de tijolos polidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorito", + "block.mineralogy.diorite_brick_wall": "Muro de tijolos de Diorito", + "block.mineralogy.diorite_smooth_wall": "Muro polido de Diorito", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de tijolos polidos de Diorito", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de tijolos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro polido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de tijolos polidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolito", + "block.mineralogy.rhyolite_brick_wall": "Muro de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_wall": "Muro polido de Riolito", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatito", + "block.mineralogy.pegmatite_brick_wall": "Muro de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_wall": "Muro polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de tijolos polidos de Pegmatito", + "block.mineralogy.shale_wall": "Muro de Folhelho", + "block.mineralogy.shale_brick_wall": "Muro de tijolos de Folhelho", + "block.mineralogy.shale_smooth_wall": "Muro polido de Folhelho", + "block.mineralogy.shale_smooth_brick_wall": "Muro de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_wall": "Muro de Dolomita", + "block.mineralogy.dolomite_brick_wall": "Muro de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro polido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de tijolos polidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Calcário", + "block.mineralogy.limestone_brick_wall": "Muro de tijolos de Calcário", + "block.mineralogy.limestone_smooth_wall": "Muro polido de Calcário", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de tijolos polidos de Calcário", + "block.mineralogy.marble_wall": "Muro de Mármore", + "block.mineralogy.marble_brick_wall": "Muro de tijolos de Mármore", + "block.mineralogy.marble_smooth_wall": "Muro polido de Mármore", + "block.mineralogy.marble_smooth_brick_wall": "Muro de tijolos polidos de Mármore", + "block.mineralogy.slate_wall": "Muro de Ardósia", + "block.mineralogy.slate_brick_wall": "Muro de tijolos de Ardósia", + "block.mineralogy.slate_smooth_wall": "Muro polido de Ardósia", + "block.mineralogy.slate_smooth_brick_wall": "Muro de tijolos polidos de Ardósia", + "block.mineralogy.schist_wall": "Muro de Xisto", + "block.mineralogy.schist_brick_wall": "Muro de tijolos de Xisto", + "block.mineralogy.schist_smooth_wall": "Muro polido de Xisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de tijolos polidos de Xisto", + "block.mineralogy.gneiss_wall": "Muro de Gnaisse", + "block.mineralogy.gneiss_brick_wall": "Muro de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_wall": "Muro polido de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_wall": "Muro de Filito", + "block.mineralogy.phyllite_brick_wall": "Muro de tijolos de Filito", + "block.mineralogy.phyllite_smooth_wall": "Muro polido de Filito", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de tijolos polidos de Filito", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolito", + "block.mineralogy.amphibolite_brick_wall": "Muro de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_wall": "Muro polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de tijolos polidos de Anfibolito", + "block.mineralogy.andesite_furnace": "Fornalha de Andesito", + "block.mineralogy.andesite_brick_furnace": "Fornalha de tijolos de Andesito", + "block.mineralogy.andesite_smooth_furnace": "Fornalha polida de Andesito", + "block.mineralogy.andesite_smooth_brick_furnace": "Fornalha de tijolos polidos de Andesito", + "block.mineralogy.basalt_furnace": "Fornalha de Basalto", + "block.mineralogy.basalt_brick_furnace": "Fornalha de tijolos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Fornalha polida de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Fornalha de tijolos polidos de Basalto", + "block.mineralogy.diorite_furnace": "Fornalha de Diorito", + "block.mineralogy.diorite_brick_furnace": "Fornalha de tijolos de Diorito", + "block.mineralogy.diorite_smooth_furnace": "Fornalha polida de Diorito", + "block.mineralogy.diorite_smooth_brick_furnace": "Fornalha de tijolos polidos de Diorito", + "block.mineralogy.granite_furnace": "Fornalha de Granito", + "block.mineralogy.granite_brick_furnace": "Fornalha de tijolos de Granito", + "block.mineralogy.granite_smooth_furnace": "Fornalha polida de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Fornalha de tijolos polidos de Granito", + "block.mineralogy.rhyolite_furnace": "Fornalha de Riolito", + "block.mineralogy.rhyolite_brick_furnace": "Fornalha de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_furnace": "Fornalha polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_furnace": "Fornalha de Pegmatito", + "block.mineralogy.pegmatite_brick_furnace": "Fornalha de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_furnace": "Fornalha polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fornalha de tijolos polidos de Pegmatito", + "block.mineralogy.shale_furnace": "Fornalha de Folhelho", + "block.mineralogy.shale_brick_furnace": "Fornalha de tijolos de Folhelho", + "block.mineralogy.shale_smooth_furnace": "Fornalha polida de Folhelho", + "block.mineralogy.shale_smooth_brick_furnace": "Fornalha de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_furnace": "Fornalha de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Fornalha de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Fornalha polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fornalha de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Fornalha de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Fornalha de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Fornalha polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fornalha de tijolos polidos de Dolomita", + "block.mineralogy.limestone_furnace": "Fornalha de Calcário", + "block.mineralogy.limestone_brick_furnace": "Fornalha de tijolos de Calcário", + "block.mineralogy.limestone_smooth_furnace": "Fornalha polida de Calcário", + "block.mineralogy.limestone_smooth_brick_furnace": "Fornalha de tijolos polidos de Calcário", + "block.mineralogy.marble_furnace": "Fornalha de Mármore", + "block.mineralogy.marble_brick_furnace": "Fornalha de tijolos de Mármore", + "block.mineralogy.marble_smooth_furnace": "Fornalha polida de Mármore", + "block.mineralogy.marble_smooth_brick_furnace": "Fornalha de tijolos polidos de Mármore", + "block.mineralogy.slate_furnace": "Fornalha de Ardósia", + "block.mineralogy.slate_brick_furnace": "Fornalha de tijolos de Ardósia", + "block.mineralogy.slate_smooth_furnace": "Fornalha polida de Ardósia", + "block.mineralogy.slate_smooth_brick_furnace": "Fornalha de tijolos polidos de Ardósia", + "block.mineralogy.schist_furnace": "Fornalha de Xisto", + "block.mineralogy.schist_brick_furnace": "Fornalha de tijolos de Xisto", + "block.mineralogy.schist_smooth_furnace": "Fornalha polida de Xisto", + "block.mineralogy.schist_smooth_brick_furnace": "Fornalha de tijolos polidos de Xisto", + "block.mineralogy.gneiss_furnace": "Fornalha de Gnaisse", + "block.mineralogy.gneiss_brick_furnace": "Fornalha de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_furnace": "Fornalha polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fornalha de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_furnace": "Fornalha de Filito", + "block.mineralogy.phyllite_brick_furnace": "Fornalha de tijolos de Filito", + "block.mineralogy.phyllite_smooth_furnace": "Fornalha polida de Filito", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fornalha de tijolos polidos de Filito", + "block.mineralogy.amphibolite_furnace": "Fornalha de Anfibolito", + "block.mineralogy.amphibolite_brick_furnace": "Fornalha de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_furnace": "Fornalha polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Anfibolito", "block.mineralogy.diabase": "Diabásio", - "block.mineralogy.diabase_stairs": "Escada de Diabásio", + "block.mineralogy.diabase_stairs": "Escadas de Diabásio", "block.mineralogy.diabase_slab": "Laje de Diabásio", - "block.mineralogy.diabase_brick": "Tijolo de Diabásio", - "block.mineralogy.diabase_brick_stairs": "Escadas de tijolos de diabásio", - "block.mineralogy.diabase_brick_slab": "Laje de tijolo de diabásio", - "block.mineralogy.diabase_smooth": "Diabásio Polido", - "block.mineralogy.diabase_smooth_stairs": "Escada polida em diabásio", - "block.mineralogy.diabase_smooth_slab": "Laje Polida de Diabásio", - "block.mineralogy.diabase_smooth_brick": "Tijolo polido de diabásio", - "block.mineralogy.diabase_smooth_brick_stairs": "Escadas de tijolo polido de diabásio", - "block.mineralogy.diabase_smooth_brick_slab": "Laje de tijolo polido de diabásio", - "block.mineralogy.diabase_wall": "Parede de Diabásio", - "block.mineralogy.diabase_brick_wall": "Parede de tijolos de diabásio", - "block.mineralogy.diabase_smooth_wall": "Parede Polida Diabásio", - "block.mineralogy.diabase_smooth_brick_wall": "Parede de Tijolo Polido Diabásio", - "block.mineralogy.diabase_furnace": "Forno de Diabásio", - "block.mineralogy.diabase_brick_furnace": "Forno de tijolos de diabásio", - "block.mineralogy.diabase_smooth_furnace": "Forno Polido de Diabásio", - "block.mineralogy.diabase_smooth_brick_furnace": "Forno de tijolo polido de diabásio", + "block.mineralogy.diabase_brick": "Tijolos de Diabásio", + "block.mineralogy.diabase_brick_stairs": "Escadas de tijolos de Diabásio", + "block.mineralogy.diabase_brick_slab": "Laje de tijolos de Diabásio", + "block.mineralogy.diabase_smooth": "Bloco polido de Diabásio", + "block.mineralogy.diabase_smooth_stairs": "Escadas polidas de Diabásio", + "block.mineralogy.diabase_smooth_slab": "Laje polida de Diabásio", + "block.mineralogy.diabase_smooth_brick": "Tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_stairs": "Escadas de tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_slab": "Laje de tijolos polidos de Diabásio", + "block.mineralogy.diabase_wall": "Muro de Diabásio", + "block.mineralogy.diabase_brick_wall": "Muro de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_wall": "Muro polido de Diabásio", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de tijolos polidos de Diabásio", + "block.mineralogy.diabase_furnace": "Fornalha de Diabásio", + "block.mineralogy.diabase_brick_furnace": "Fornalha de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_furnace": "Fornalha polida de Diabásio", + "block.mineralogy.diabase_smooth_brick_furnace": "Fornalha de tijolos polidos de Diabásio", "block.mineralogy.gabbro": "Gabro", - "block.mineralogy.gabbro_stairs": "Escada Gabbro", + "block.mineralogy.gabbro_stairs": "Escadas de Gabro", "block.mineralogy.gabbro_slab": "Laje de Gabro", - "block.mineralogy.gabbro_brick": "Tijolo Gabro", - "block.mineralogy.gabbro_brick_stairs": "Escadas de tijolo Gabbro", - "block.mineralogy.gabbro_brick_slab": "Laje de tijolo Gabbro", - "block.mineralogy.gabbro_smooth": "Gabro Polido", - "block.mineralogy.gabbro_smooth_stairs": "Escadas Polidas Gabbro", - "block.mineralogy.gabbro_smooth_slab": "Laje Polida Gabbro", - "block.mineralogy.gabbro_smooth_brick": "Tijolo Polido Gabbro", - "block.mineralogy.gabbro_smooth_brick_stairs": "Escadas de tijolo polido Gabbro", - "block.mineralogy.gabbro_smooth_brick_slab": "Laje de tijolo polido Gabbro", - "block.mineralogy.gabbro_wall": "Parede de Gabro", - "block.mineralogy.gabbro_brick_wall": "Parede de tijolos gabro", - "block.mineralogy.gabbro_smooth_wall": "Parede Polida Gabbro", - "block.mineralogy.gabbro_smooth_brick_wall": "Parede de tijolo polido Gabbro", - "block.mineralogy.gabbro_furnace": "Forno Gabro", - "block.mineralogy.gabbro_brick_furnace": "Forno de tijolos Gabbro", - "block.mineralogy.gabbro_smooth_furnace": "Forno Polido Gabro", - "block.mineralogy.gabbro_smooth_brick_furnace": "Forno de tijolo polido Gabbro", + "block.mineralogy.gabbro_brick": "Tijolos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escadas de tijolos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Laje de tijolos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloco polido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escadas polidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Laje polida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escadas de tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Laje de tijolos polidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro polido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de tijolos polidos de Gabro", + "block.mineralogy.gabbro_furnace": "Fornalha de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Fornalha de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Fornalha polida de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fornalha de tijolos polidos de Gabro", "block.mineralogy.peridotite": "Peridotito", - "block.mineralogy.peridotite_stairs": "Escadas de Peridotita", - "block.mineralogy.peridotite_slab": "Laje de Peridotita", - "block.mineralogy.peridotite_brick": "Tijolo Peridotita", - "block.mineralogy.peridotite_brick_stairs": "Escadas de tijolos de peridotita", - "block.mineralogy.peridotite_brick_slab": "Laje de tijolo de peridotita", - "block.mineralogy.peridotite_smooth": "Peridotita Polida", - "block.mineralogy.peridotite_smooth_stairs": "Escadas polidas com peridotita", - "block.mineralogy.peridotite_smooth_slab": "Laje Polida de Peridotita", - "block.mineralogy.peridotite_smooth_brick": "Tijolo Polido Peridotita", - "block.mineralogy.peridotite_smooth_brick_stairs": "Escadas de tijolo polido com peridotita", - "block.mineralogy.peridotite_smooth_brick_slab": "Laje de tijolo polido com peridotita", - "block.mineralogy.peridotite_wall": "Parede de Peridotita", - "block.mineralogy.peridotite_brick_wall": "Parede de tijolos de peridotita", - "block.mineralogy.peridotite_smooth_wall": "Parede Polida Peridotita", - "block.mineralogy.peridotite_smooth_brick_wall": "Parede de tijolo polido com peridotita", - "block.mineralogy.peridotite_furnace": "Forno de Peridotita", - "block.mineralogy.peridotite_brick_furnace": "Forno de tijolos de peridotita", - "block.mineralogy.peridotite_smooth_furnace": "Forno Polido de Peridotita", - "block.mineralogy.peridotite_smooth_brick_furnace": "Forno de tijolo polido de peridotita", - "block.mineralogy.basaltic_glass": "Vidro Basáltico", - "block.mineralogy.basaltic_glass_stairs": "Escadas de vidro basáltico", - "block.mineralogy.basaltic_glass_slab": "Laje de vidro basáltico", - "block.mineralogy.basaltic_glass_brick": "Tijolo de vidro basáltico", - "block.mineralogy.basaltic_glass_brick_stairs": "Escadas de tijolos de vidro basáltico", - "block.mineralogy.basaltic_glass_brick_slab": "Laje de tijolo de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth": "Vidro Basáltico Polido", - "block.mineralogy.basaltic_glass_smooth_stairs": "Escadas polidas de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_slab": "Laje polida de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_brick": "Tijolo polido de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escadas de tijolo polido de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Laje de tijolo polido de vidro basáltico", - "block.mineralogy.basaltic_glass_wall": "Parede de vidro basáltico", - "block.mineralogy.basaltic_glass_brick_wall": "Parede de tijolos de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_wall": "Parede polida de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Parede de tijolo polido de vidro basáltico", - "block.mineralogy.basaltic_glass_furnace": "Forno de vidro basáltico", - "block.mineralogy.basaltic_glass_brick_furnace": "Forno de tijolo de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_furnace": "Forno polido de vidro basáltico", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Forno de tijolo polido de vidro basáltico", + "block.mineralogy.peridotite_stairs": "Escadas de Peridotito", + "block.mineralogy.peridotite_slab": "Laje de Peridotito", + "block.mineralogy.peridotite_brick": "Tijolos de Peridotito", + "block.mineralogy.peridotite_brick_stairs": "Escadas de tijolos de Peridotito", + "block.mineralogy.peridotite_brick_slab": "Laje de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth": "Bloco polido de Peridotito", + "block.mineralogy.peridotite_smooth_stairs": "Escadas polidas de Peridotito", + "block.mineralogy.peridotite_smooth_slab": "Laje polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick": "Tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escadas de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_slab": "Laje de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_wall": "Muro de Peridotito", + "block.mineralogy.peridotite_brick_wall": "Muro de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_wall": "Muro polido de Peridotito", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_furnace": "Fornalha de Peridotito", + "block.mineralogy.peridotite_brick_furnace": "Fornalha de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_furnace": "Fornalha polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fornalha de tijolos polidos de Peridotito", + "block.mineralogy.basaltic_glass": "Vidro basáltico", + "block.mineralogy.basaltic_glass_stairs": "Escadas de Vidro basáltico", + "block.mineralogy.basaltic_glass_slab": "Laje de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick": "Tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escadas de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Laje de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloco polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escadas polidas de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Laje polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escadas de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Laje de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_furnace": "Fornalha de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Fornalha de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fornalha polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fornalha de tijolos polidos de Vidro basáltico", "block.mineralogy.scoria": "Escória", "block.mineralogy.scoria_stairs": "Escadas de Escória", "block.mineralogy.scoria_slab": "Laje de Escória", - "block.mineralogy.scoria_brick": "Tijolo Escoria", - "block.mineralogy.scoria_brick_stairs": "Escadas de tijolos Scoria", - "block.mineralogy.scoria_brick_slab": "Laje de tijolo Scoria", - "block.mineralogy.scoria_smooth": "Escória Polida", - "block.mineralogy.scoria_smooth_stairs": "Escadas Polidas Scoria", - "block.mineralogy.scoria_smooth_slab": "Laje Polida Scoria", - "block.mineralogy.scoria_smooth_brick": "Tijolo polido Scoria", - "block.mineralogy.scoria_smooth_brick_stairs": "Escadas de tijolo polido Scoria", - "block.mineralogy.scoria_smooth_brick_slab": "Laje de tijolo polido Scoria", - "block.mineralogy.scoria_wall": "Parede de Escória", - "block.mineralogy.scoria_brick_wall": "Parede de tijolos de Scoria", - "block.mineralogy.scoria_smooth_wall": "Parede Polida Scoria", - "block.mineralogy.scoria_smooth_brick_wall": "Parede de tijolo polido Scoria", - "block.mineralogy.scoria_furnace": "Forno Scoria", - "block.mineralogy.scoria_brick_furnace": "Forno de tijolos Scoria", - "block.mineralogy.scoria_smooth_furnace": "Forno Polido Scoria", - "block.mineralogy.scoria_smooth_brick_furnace": "Forno de tijolo polido Scoria", + "block.mineralogy.scoria_brick": "Tijolos de Escória", + "block.mineralogy.scoria_brick_stairs": "Escadas de tijolos de Escória", + "block.mineralogy.scoria_brick_slab": "Laje de tijolos de Escória", + "block.mineralogy.scoria_smooth": "Bloco polido de Escória", + "block.mineralogy.scoria_smooth_stairs": "Escadas polidas de Escória", + "block.mineralogy.scoria_smooth_slab": "Laje polida de Escória", + "block.mineralogy.scoria_smooth_brick": "Tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_stairs": "Escadas de tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_slab": "Laje de tijolos polidos de Escória", + "block.mineralogy.scoria_wall": "Muro de Escória", + "block.mineralogy.scoria_brick_wall": "Muro de tijolos de Escória", + "block.mineralogy.scoria_smooth_wall": "Muro polido de Escória", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de tijolos polidos de Escória", + "block.mineralogy.scoria_furnace": "Fornalha de Escória", + "block.mineralogy.scoria_brick_furnace": "Fornalha de tijolos de Escória", + "block.mineralogy.scoria_smooth_furnace": "Fornalha polida de Escória", + "block.mineralogy.scoria_smooth_brick_furnace": "Fornalha de tijolos polidos de Escória", "block.mineralogy.tuff": "Tufo", - "block.mineralogy.tuff_stairs": "Escadas de tufo", - "block.mineralogy.tuff_slab": "Laje de tufo", - "block.mineralogy.tuff_brick": "Tijolo de tufo", - "block.mineralogy.tuff_brick_stairs": "Escadas de tijolo tufo", - "block.mineralogy.tuff_brick_slab": "Laje de tijolo tufo", - "block.mineralogy.tuff_smooth": "Tufo Polido", - "block.mineralogy.tuff_smooth_stairs": "Escadas de tufo polido", - "block.mineralogy.tuff_smooth_slab": "Laje polida de tufo", - "block.mineralogy.tuff_smooth_brick": "Tijolo polido tufo", - "block.mineralogy.tuff_smooth_brick_stairs": "Escadas de tijolo polido", - "block.mineralogy.tuff_smooth_brick_slab": "Laje de tijolo polido de tufo", - "block.mineralogy.tuff_wall": "Parede de tufo", - "block.mineralogy.tuff_brick_wall": "Parede de tijolos de tufo", - "block.mineralogy.tuff_smooth_wall": "Parede polida de tufo", - "block.mineralogy.tuff_smooth_brick_wall": "Parede de tijolo polido tufo", - "block.mineralogy.tuff_furnace": "Forno de tufo", - "block.mineralogy.tuff_brick_furnace": "Forno de tijolo tufo", - "block.mineralogy.tuff_smooth_furnace": "Forno de tufo polido", - "block.mineralogy.tuff_smooth_brick_furnace": "Forno de tijolo polido de tufo", + "block.mineralogy.tuff_stairs": "Escadas de Tufo", + "block.mineralogy.tuff_slab": "Laje de Tufo", + "block.mineralogy.tuff_brick": "Tijolos de Tufo", + "block.mineralogy.tuff_brick_stairs": "Escadas de tijolos de Tufo", + "block.mineralogy.tuff_brick_slab": "Laje de tijolos de Tufo", + "block.mineralogy.tuff_smooth": "Bloco polido de Tufo", + "block.mineralogy.tuff_smooth_stairs": "Escadas polidas de Tufo", + "block.mineralogy.tuff_smooth_slab": "Laje polida de Tufo", + "block.mineralogy.tuff_smooth_brick": "Tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_stairs": "Escadas de tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_slab": "Laje de tijolos polidos de Tufo", + "block.mineralogy.tuff_wall": "Muro de Tufo", + "block.mineralogy.tuff_brick_wall": "Muro de tijolos de Tufo", + "block.mineralogy.tuff_smooth_wall": "Muro polido de Tufo", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de tijolos polidos de Tufo", + "block.mineralogy.tuff_furnace": "Fornalha de Tufo", + "block.mineralogy.tuff_brick_furnace": "Fornalha de tijolos de Tufo", + "block.mineralogy.tuff_smooth_furnace": "Fornalha polida de Tufo", + "block.mineralogy.tuff_smooth_brick_furnace": "Fornalha de tijolos polidos de Tufo", "block.mineralogy.siltstone": "Siltito", - "block.mineralogy.siltstone_stairs": "Escadas de Siltstone", - "block.mineralogy.siltstone_slab": "Laje de siltito", - "block.mineralogy.siltstone_brick": "Tijolo de Siltstone", - "block.mineralogy.siltstone_brick_stairs": "Escadas de tijolos de siltstone", - "block.mineralogy.siltstone_brick_slab": "Laje de tijolo de siltito", - "block.mineralogy.siltstone_smooth": "Siltito Polido", - "block.mineralogy.siltstone_smooth_stairs": "Escadas Polidas de Siltstone", - "block.mineralogy.siltstone_smooth_slab": "Laje Polida de Siltstone", - "block.mineralogy.siltstone_smooth_brick": "Tijolo Polido de Siltstone", - "block.mineralogy.siltstone_smooth_brick_stairs": "Escadas de tijolo polido de siltstone", - "block.mineralogy.siltstone_smooth_brick_slab": "Laje de tijolo polido de siltito", - "block.mineralogy.siltstone_wall": "Parede de Siltito", - "block.mineralogy.siltstone_brick_wall": "Parede de tijolos de siltito", - "block.mineralogy.siltstone_smooth_wall": "Parede Polida de Siltstone", - "block.mineralogy.siltstone_smooth_brick_wall": "Parede de tijolo polido de siltstone", - "block.mineralogy.siltstone_furnace": "Forno de siltito", - "block.mineralogy.siltstone_brick_furnace": "Forno de tijolos de siltito", - "block.mineralogy.siltstone_smooth_furnace": "Forno Polido de Siltstone", - "block.mineralogy.siltstone_smooth_brick_furnace": "Forno de tijolo polido de siltstone", + "block.mineralogy.siltstone_stairs": "Escadas de Siltito", + "block.mineralogy.siltstone_slab": "Laje de Siltito", + "block.mineralogy.siltstone_brick": "Tijolos de Siltito", + "block.mineralogy.siltstone_brick_stairs": "Escadas de tijolos de Siltito", + "block.mineralogy.siltstone_brick_slab": "Laje de tijolos de Siltito", + "block.mineralogy.siltstone_smooth": "Bloco polido de Siltito", + "block.mineralogy.siltstone_smooth_stairs": "Escadas polidas de Siltito", + "block.mineralogy.siltstone_smooth_slab": "Laje polida de Siltito", + "block.mineralogy.siltstone_smooth_brick": "Tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escadas de tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_slab": "Laje de tijolos polidos de Siltito", + "block.mineralogy.siltstone_wall": "Muro de Siltito", + "block.mineralogy.siltstone_brick_wall": "Muro de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_wall": "Muro polido de Siltito", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de tijolos polidos de Siltito", + "block.mineralogy.siltstone_furnace": "Fornalha de Siltito", + "block.mineralogy.siltstone_brick_furnace": "Fornalha de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_furnace": "Fornalha polida de Siltito", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fornalha de tijolos polidos de Siltito", "block.mineralogy.rock_salt": "Sal-gema", - "block.mineralogy.rock_salt_stairs": "Escadas de sal-gema", - "block.mineralogy.rock_salt_slab": "Laje de sal-gema", - "block.mineralogy.rock_salt_brick": "Tijolo de sal-gema", - "block.mineralogy.rock_salt_brick_stairs": "Escadas de tijolos de sal-gema", - "block.mineralogy.rock_salt_brick_slab": "Laje de tijolo de sal-gema", - "block.mineralogy.rock_salt_smooth": "Sal-gema polido", - "block.mineralogy.rock_salt_smooth_stairs": "Escadas polidas com sal-gema", - "block.mineralogy.rock_salt_smooth_slab": "Laje polida de sal-gema", - "block.mineralogy.rock_salt_smooth_brick": "Tijolo polido de sal-gema", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Escadas de tijolo polido com sal-gema", - "block.mineralogy.rock_salt_smooth_brick_slab": "Laje de tijolo polido com sal-gema", - "block.mineralogy.rock_salt_wall": "Parede de sal-gema", - "block.mineralogy.rock_salt_brick_wall": "Parede de tijolos de sal-gema", - "block.mineralogy.rock_salt_smooth_wall": "Parede polida com sal-gema", - "block.mineralogy.rock_salt_smooth_brick_wall": "Parede de tijolo polido com sal-gema", - "block.mineralogy.rock_salt_furnace": "Forno de sal-gema", - "block.mineralogy.rock_salt_brick_furnace": "Forno de tijolos de sal-gema", - "block.mineralogy.rock_salt_smooth_furnace": "Forno polido de sal-gema", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Forno de tijolo polido com sal-gema", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Escadas Hornfels", - "block.mineralogy.hornfels_slab": "Laje Hornfels", - "block.mineralogy.hornfels_brick": "Tijolo Hornfels", - "block.mineralogy.hornfels_brick_stairs": "Escadas de tijolos Hornfels", - "block.mineralogy.hornfels_brick_slab": "Laje de tijolo Hornfels", - "block.mineralogy.hornfels_smooth": "Hornfels polidos", - "block.mineralogy.hornfels_smooth_stairs": "Escadas Polidas Hornfels", - "block.mineralogy.hornfels_smooth_slab": "Laje Polida Hornfels", - "block.mineralogy.hornfels_smooth_brick": "Tijolo Polido Hornfels", - "block.mineralogy.hornfels_smooth_brick_stairs": "Escadas de tijolo polido Hornfels", - "block.mineralogy.hornfels_smooth_brick_slab": "Laje de tijolo polido Hornfels", - "block.mineralogy.hornfels_wall": "Muralha de Hornfels", - "block.mineralogy.hornfels_brick_wall": "Parede de tijolos Hornfels", - "block.mineralogy.hornfels_smooth_wall": "Parede Polida Hornfels", - "block.mineralogy.hornfels_smooth_brick_wall": "Parede de tijolo polido Hornfels", - "block.mineralogy.hornfels_furnace": "Forno Hornfels", - "block.mineralogy.hornfels_brick_furnace": "Forno de tijolos Hornfels", - "block.mineralogy.hornfels_smooth_furnace": "Forno Polido Hornfels", - "block.mineralogy.hornfels_smooth_brick_furnace": "Forno de tijolo polido Hornfels", + "block.mineralogy.rock_salt_stairs": "Escadas de Sal-gema", + "block.mineralogy.rock_salt_slab": "Laje de Sal-gema", + "block.mineralogy.rock_salt_brick": "Tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_stairs": "Escadas de tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_slab": "Laje de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth": "Bloco polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_stairs": "Escadas polidas de Sal-gema", + "block.mineralogy.rock_salt_smooth_slab": "Laje polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick": "Tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escadas de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_slab": "Laje de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_wall": "Muro de Sal-gema", + "block.mineralogy.rock_salt_brick_wall": "Muro de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_wall": "Muro polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_furnace": "Fornalha de Sal-gema", + "block.mineralogy.rock_salt_brick_furnace": "Fornalha de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_furnace": "Fornalha polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fornalha de tijolos polidos de Sal-gema", + "block.mineralogy.hornfels": "Cornubianito", + "block.mineralogy.hornfels_stairs": "Escadas de Cornubianito", + "block.mineralogy.hornfels_slab": "Laje de Cornubianito", + "block.mineralogy.hornfels_brick": "Tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_stairs": "Escadas de tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_slab": "Laje de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth": "Bloco polido de Cornubianito", + "block.mineralogy.hornfels_smooth_stairs": "Escadas polidas de Cornubianito", + "block.mineralogy.hornfels_smooth_slab": "Laje polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick": "Tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escadas de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_slab": "Laje de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_wall": "Muro de Cornubianito", + "block.mineralogy.hornfels_brick_wall": "Muro de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_wall": "Muro polido de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_furnace": "Fornalha de Cornubianito", + "block.mineralogy.hornfels_brick_furnace": "Fornalha de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_furnace": "Fornalha polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fornalha de tijolos polidos de Cornubianito", "block.mineralogy.quartzite": "Quartzito", "block.mineralogy.quartzite_stairs": "Escadas de Quartzito", "block.mineralogy.quartzite_slab": "Laje de Quartzito", - "block.mineralogy.quartzite_brick": "Tijolo de Quartzito", - "block.mineralogy.quartzite_brick_stairs": "Escadas de tijolos de quartzito", - "block.mineralogy.quartzite_brick_slab": "Laje de tijolo de quartzito", - "block.mineralogy.quartzite_smooth": "Quartzito Polido", - "block.mineralogy.quartzite_smooth_stairs": "Escadas Polidas em Quartzito", - "block.mineralogy.quartzite_smooth_slab": "Laje Polida de Quartzito", - "block.mineralogy.quartzite_smooth_brick": "Tijolo polido de quartzito", - "block.mineralogy.quartzite_smooth_brick_stairs": "Escadas de tijolo polido de quartzito", - "block.mineralogy.quartzite_smooth_brick_slab": "Laje de tijolo polido de quartzito", - "block.mineralogy.quartzite_wall": "Parede de Quartzito", - "block.mineralogy.quartzite_brick_wall": "Parede de tijolos de quartzito", - "block.mineralogy.quartzite_smooth_wall": "Parede Polida de Quartzito", - "block.mineralogy.quartzite_smooth_brick_wall": "Parede de tijolo polido de quartzito", - "block.mineralogy.quartzite_furnace": "Forno de Quartzito", - "block.mineralogy.quartzite_brick_furnace": "Forno de tijolos de quartzito", - "block.mineralogy.quartzite_smooth_furnace": "Forno Polido de Quartzito", - "block.mineralogy.quartzite_smooth_brick_furnace": "Forno de tijolo polido de quartzito", + "block.mineralogy.quartzite_brick": "Tijolos de Quartzito", + "block.mineralogy.quartzite_brick_stairs": "Escadas de tijolos de Quartzito", + "block.mineralogy.quartzite_brick_slab": "Laje de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth": "Bloco polido de Quartzito", + "block.mineralogy.quartzite_smooth_stairs": "Escadas polidas de Quartzito", + "block.mineralogy.quartzite_smooth_slab": "Laje polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick": "Tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escadas de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_slab": "Laje de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_wall": "Muro de Quartzito", + "block.mineralogy.quartzite_brick_wall": "Muro de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_wall": "Muro polido de Quartzito", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_furnace": "Fornalha de Quartzito", + "block.mineralogy.quartzite_brick_furnace": "Fornalha de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_furnace": "Fornalha polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fornalha de tijolos polidos de Quartzito", "block.mineralogy.novaculite": "Novaculita", - "block.mineralogy.novaculite_stairs": "Escada Novaculita", + "block.mineralogy.novaculite_stairs": "Escadas de Novaculita", "block.mineralogy.novaculite_slab": "Laje de Novaculita", - "block.mineralogy.novaculite_brick": "Tijolo Novaculita", - "block.mineralogy.novaculite_brick_stairs": "Escadas de Tijolo Novaculite", - "block.mineralogy.novaculite_brick_slab": "Laje de Tijolo Novaculita", - "block.mineralogy.novaculite_smooth": "Novaculita Polida", - "block.mineralogy.novaculite_smooth_stairs": "Escadas Polidas Novaculite", - "block.mineralogy.novaculite_smooth_slab": "Laje Polida Novaculite", - "block.mineralogy.novaculite_smooth_brick": "Tijolo Polido Novaculita", - "block.mineralogy.novaculite_smooth_brick_stairs": "Escadas de tijolo polido Novaculite", - "block.mineralogy.novaculite_smooth_brick_slab": "Laje de tijolo polido Novaculite", - "block.mineralogy.novaculite_wall": "Parede de Novaculita", - "block.mineralogy.novaculite_brick_wall": "Parede de Tijolos Novaculita", - "block.mineralogy.novaculite_smooth_wall": "Parede Polida Novaculite", - "block.mineralogy.novaculite_smooth_brick_wall": "Parede de tijolo polido Novaculite", - "block.mineralogy.novaculite_furnace": "Forno Novaculita", - "block.mineralogy.novaculite_brick_furnace": "Forno de tijolos de novaculita", - "block.mineralogy.novaculite_smooth_furnace": "Forno Polido Novaculite", - "block.mineralogy.novaculite_smooth_brick_furnace": "Forno de tijolo polido Novaculite", + "block.mineralogy.novaculite_brick": "Tijolos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escadas de tijolos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Laje de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloco polido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escadas polidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Laje polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escadas de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Laje de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro polido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Fornalha de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Fornalha de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Fornalha polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fornalha de tijolos polidos de Novaculita", "block.mineralogy.chalk": "Giz", - "item.mineralogy.chalk_dust": "Giz em Pó", + "item.mineralogy.chalk_dust": "Pó de giz", "item.mineralogy.salt_dust": "Sal", "item.mineralogy.rock_salt_dust": "Cristais de sal-gema", - "block.mineralogy.rocksaltlamp": "Lâmpada de sal-gema", - "block.mineralogy.rocksaltstreetlamp": "Lâmpada de rua de sal-gema", - "block.mineralogy.andesite_relief_axe": "Alívio de Machado de Andesito", - "block.mineralogy.andesite_relief_blank": "Relevo em branco do andesito", - "block.mineralogy.andesite_relief_cross": "Relevo Cruzado Andesito", - "block.mineralogy.andesite_relief_hammer": "Alívio do Martelo Andesito", - "block.mineralogy.andesite_relief_hoe": "Alívio da enxada andesita", - "block.mineralogy.andesite_relief_horizontal": "Relevo Horizontal Andesítico", - "block.mineralogy.andesite_relief_i": "Andesito I Relevo", - "block.mineralogy.andesite_relief_left": "Relevo Andesito Esquerdo", - "block.mineralogy.andesite_relief_pickaxe": "Alívio de Picareta Andesita", - "block.mineralogy.andesite_relief_plus": "Andesita Plus Alívio", - "block.mineralogy.andesite_relief_right": "Relevo Andesito Direito", - "block.mineralogy.andesite_relief_sword": "Relevo da Espada Andesita", - "block.mineralogy.andesite_relief_vertical": "Relevo Vertical Andesítico", - "block.mineralogy.basalt_relief_axe": "Alívio de machado de basalto", - "block.mineralogy.basalt_relief_blank": "Relevo em branco de basalto", - "block.mineralogy.basalt_relief_cross": "Relevo Cruzado de Basalto", - "block.mineralogy.basalt_relief_hammer": "Relevo do martelo de basalto", - "block.mineralogy.basalt_relief_hoe": "Relevo de enxada de basalto", - "block.mineralogy.basalt_relief_horizontal": "Relevo Horizontal Basáltico", - "block.mineralogy.basalt_relief_i": "Basalto I Relevo", - "block.mineralogy.basalt_relief_left": "Relevo Basalto Esquerdo", - "block.mineralogy.basalt_relief_pickaxe": "Relevo de picareta de basalto", - "block.mineralogy.basalt_relief_plus": "Basalto Plus Relevo", - "block.mineralogy.basalt_relief_right": "Relevo direito de basalto", - "block.mineralogy.basalt_relief_sword": "Relevo de espada de basalto", - "block.mineralogy.basalt_relief_vertical": "Relevo Vertical Basáltico", - "block.mineralogy.diorite_relief_axe": "Alívio de machado de diorito", - "block.mineralogy.diorite_relief_blank": "Relevo em branco de diorito", - "block.mineralogy.diorite_relief_cross": "Relevo Cruzado Diorito", - "block.mineralogy.diorite_relief_hammer": "Alívio do Martelo Diorito", - "block.mineralogy.diorite_relief_hoe": "Relevo de enxada de diorito", - "block.mineralogy.diorite_relief_horizontal": "Relevo Horizontal Diorito", - "block.mineralogy.diorite_relief_i": "Relevo Diorito I", - "block.mineralogy.diorite_relief_left": "Diorito Esquerdo Relevo", - "block.mineralogy.diorite_relief_pickaxe": "Alívio de picareta de diorito", - "block.mineralogy.diorite_relief_plus": "Diorito Plus Alívio", - "block.mineralogy.diorite_relief_right": "Alívio Direito Diorito", - "block.mineralogy.diorite_relief_sword": "Relevo da Espada Diorita", - "block.mineralogy.diorite_relief_vertical": "Relevo Vertical Diorito", - "block.mineralogy.granite_relief_axe": "Relevo de machado de granito", - "block.mineralogy.granite_relief_blank": "Relevo em branco de granito", - "block.mineralogy.granite_relief_cross": "Relevo Cruzado em Granito", - "block.mineralogy.granite_relief_hammer": "Relevo de Martelo de Granito", - "block.mineralogy.granite_relief_hoe": "Relevo de enxada de granito", - "block.mineralogy.granite_relief_horizontal": "Relevo Horizontal Granito", - "block.mineralogy.granite_relief_i": "Granito I Relevo", - "block.mineralogy.granite_relief_left": "Relevo esquerdo em granito", - "block.mineralogy.granite_relief_pickaxe": "Relevo de Picareta em Granito", - "block.mineralogy.granite_relief_plus": "Granito Plus Relevo", - "block.mineralogy.granite_relief_right": "Relevo direito em granito", - "block.mineralogy.granite_relief_sword": "Relevo de Espada de Granito", - "block.mineralogy.granite_relief_vertical": "Relevo Vertical em Granito", - "block.mineralogy.rhyolite_relief_axe": "Alívio de machado de riolito", - "block.mineralogy.rhyolite_relief_blank": "Relevo em branco de riolito", - "block.mineralogy.rhyolite_relief_cross": "Relevo Cruzado de Riolito", - "block.mineralogy.rhyolite_relief_hammer": "Alívio do Martelo Riolito", - "block.mineralogy.rhyolite_relief_hoe": "Relevo de enxada de riolito", - "block.mineralogy.rhyolite_relief_horizontal": "Relevo horizontal do riolito", - "block.mineralogy.rhyolite_relief_i": "Relevo Riolito I", - "block.mineralogy.rhyolite_relief_left": "Relevo esquerdo do riolito", - "block.mineralogy.rhyolite_relief_pickaxe": "Alívio da Picareta Riolita", - "block.mineralogy.rhyolite_relief_plus": "Riolito Plus Alívio", - "block.mineralogy.rhyolite_relief_right": "Relevo direito do riolito", - "block.mineralogy.rhyolite_relief_sword": "Alívio da Espada Riolita", - "block.mineralogy.rhyolite_relief_vertical": "Relevo vertical do riolito", - "block.mineralogy.pegmatite_relief_axe": "Alívio de Machado Pegmatito", - "block.mineralogy.pegmatite_relief_blank": "Relevo em branco de pegmatito", - "block.mineralogy.pegmatite_relief_cross": "Relevo Cruzado Pegmatito", - "block.mineralogy.pegmatite_relief_hammer": "Alívio do Martelo Pegmatito", - "block.mineralogy.pegmatite_relief_hoe": "Relevo de enxada pegmatita", - "block.mineralogy.pegmatite_relief_horizontal": "Relevo Horizontal Pegmatítico", - "block.mineralogy.pegmatite_relief_i": "Relevo Pegmatito I", - "block.mineralogy.pegmatite_relief_left": "Relevo Pegmatito Esquerdo", - "block.mineralogy.pegmatite_relief_pickaxe": "Alívio de Picareta Pegmatita", - "block.mineralogy.pegmatite_relief_plus": "Pegmatita Plus Alívio", - "block.mineralogy.pegmatite_relief_right": "Relevo direito pegmatito", - "block.mineralogy.pegmatite_relief_sword": "Relevo da Espada Pegmatita", - "block.mineralogy.pegmatite_relief_vertical": "Relevo Vertical Pegmatítico", - "block.mineralogy.shale_relief_axe": "Alívio de machado de xisto", - "block.mineralogy.shale_relief_blank": "Relevo em branco de xisto", - "block.mineralogy.shale_relief_cross": "Relevo Cruzado de Xisto", - "block.mineralogy.shale_relief_hammer": "Alívio do Martelo de Xisto", - "block.mineralogy.shale_relief_hoe": "Relevo de enxada de xisto", - "block.mineralogy.shale_relief_horizontal": "Relevo Horizontal de Xisto", - "block.mineralogy.shale_relief_i": "Relevo de Xisto I", - "block.mineralogy.shale_relief_left": "Relevo Esquerdo de Xisto", - "block.mineralogy.shale_relief_pickaxe": "Alívio de picareta de xisto", - "block.mineralogy.shale_relief_plus": "Xisto Plus Alívio", - "block.mineralogy.shale_relief_right": "Relevo direito do xisto", - "block.mineralogy.shale_relief_sword": "Relevo da Espada de Xisto", - "block.mineralogy.shale_relief_vertical": "Relevo Vertical de Xisto", - "block.mineralogy.conglomerate_relief_axe": "Alívio do Machado do Conglomerado", - "block.mineralogy.conglomerate_relief_blank": "Alívio em branco do conglomerado", - "block.mineralogy.conglomerate_relief_cross": "Relevo Cruzado do Conglomerado", - "block.mineralogy.conglomerate_relief_hammer": "Alívio do Martelo Conglomerado", - "block.mineralogy.conglomerate_relief_hoe": "Alívio da enxada do conglomerado", - "block.mineralogy.conglomerate_relief_horizontal": "Relevo Horizontal Conglomerado", - "block.mineralogy.conglomerate_relief_i": "Alívio do Conglomerado I", - "block.mineralogy.conglomerate_relief_left": "Alívio Esquerdo do Conglomerado", - "block.mineralogy.conglomerate_relief_pickaxe": "Alívio da Picareta do Conglomerado", - "block.mineralogy.conglomerate_relief_plus": "Conglomerado Plus Alívio", - "block.mineralogy.conglomerate_relief_right": "Alívio à Direita do Conglomerado", - "block.mineralogy.conglomerate_relief_sword": "Alívio da Espada do Conglomerado", - "block.mineralogy.conglomerate_relief_vertical": "Relevo Vertical Conglomerado", - "block.mineralogy.dolomite_relief_axe": "Alívio de machado de dolomita", - "block.mineralogy.dolomite_relief_blank": "Relevo em branco dolomita", - "block.mineralogy.dolomite_relief_cross": "Relevo Cruzado Dolomita", - "block.mineralogy.dolomite_relief_hammer": "Alívio do Martelo Dolomita", - "block.mineralogy.dolomite_relief_hoe": "Alívio da enxada dolomita", - "block.mineralogy.dolomite_relief_horizontal": "Relevo Horizontal Dolomita", - "block.mineralogy.dolomite_relief_i": "Relevo Dolomita I", - "block.mineralogy.dolomite_relief_left": "Relevo Dolomita Esquerdo", - "block.mineralogy.dolomite_relief_pickaxe": "Alívio de Picareta Dolomita", - "block.mineralogy.dolomite_relief_plus": "Dolomita Plus Alívio", - "block.mineralogy.dolomite_relief_right": "Relevo Dolomita Direita", - "block.mineralogy.dolomite_relief_sword": "Relevo da Espada Dolomita", - "block.mineralogy.dolomite_relief_vertical": "Relevo Vertical Dolomita", - "block.mineralogy.limestone_relief_axe": "Alívio de machado de calcário", - "block.mineralogy.limestone_relief_blank": "Relevo em branco de calcário", - "block.mineralogy.limestone_relief_cross": "Relevo Cruzado de Calcário", - "block.mineralogy.limestone_relief_hammer": "Relevo de Martelo de Calcário", - "block.mineralogy.limestone_relief_hoe": "Relevo de enxada de calcário", - "block.mineralogy.limestone_relief_horizontal": "Relevo Horizontal de Calcário", - "block.mineralogy.limestone_relief_i": "Relevo de Calcário I", - "block.mineralogy.limestone_relief_left": "Relevo Esquerdo de Calcário", - "block.mineralogy.limestone_relief_pickaxe": "Relevo de picareta de calcário", - "block.mineralogy.limestone_relief_plus": "Calcário Plus Alívio", - "block.mineralogy.limestone_relief_right": "Relevo direito de calcário", - "block.mineralogy.limestone_relief_sword": "Relevo de Espada de Calcário", - "block.mineralogy.limestone_relief_vertical": "Relevo vertical de calcário", - "block.mineralogy.marble_relief_axe": "Alívio de Machado de Mármore", - "block.mineralogy.marble_relief_blank": "Relevo em branco de mármore", - "block.mineralogy.marble_relief_cross": "Relevo Cruzado em Mármore", - "block.mineralogy.marble_relief_hammer": "Relevo de martelo de mármore", - "block.mineralogy.marble_relief_hoe": "Relevo de enxada de mármore", - "block.mineralogy.marble_relief_horizontal": "Relevo Horizontal de Mármore", - "block.mineralogy.marble_relief_i": "Mármore I Relevo", - "block.mineralogy.marble_relief_left": "Mármore Relevo Esquerdo", - "block.mineralogy.marble_relief_pickaxe": "Relevo de Picareta de Mármore", - "block.mineralogy.marble_relief_plus": "Mármore Plus Relevo", - "block.mineralogy.marble_relief_right": "Mármore Relevo Direito", - "block.mineralogy.marble_relief_sword": "Relevo de Espada de Mármore", - "block.mineralogy.marble_relief_vertical": "Relevo vertical de mármore", - "block.mineralogy.slate_relief_axe": "Alívio de machado de ardósia", - "block.mineralogy.slate_relief_blank": "Relevo em branco de ardósia", - "block.mineralogy.slate_relief_cross": "Relevo Cruzado em Ardósia", - "block.mineralogy.slate_relief_hammer": "Alívio do martelo de ardósia", - "block.mineralogy.slate_relief_hoe": "Relevo de enxada de ardósia", - "block.mineralogy.slate_relief_horizontal": "Relevo Horizontal de Ardósia", - "block.mineralogy.slate_relief_i": "Relevo de Ardósia I", - "block.mineralogy.slate_relief_left": "Relevo Esquerdo em Ardósia", - "block.mineralogy.slate_relief_pickaxe": "Alívio de picareta de ardósia", - "block.mineralogy.slate_relief_plus": "Slate Plus Alívio", - "block.mineralogy.slate_relief_right": "Alívio direito de ardósia", - "block.mineralogy.slate_relief_sword": "Relevo da Espada de Ardósia", - "block.mineralogy.slate_relief_vertical": "Relevo Vertical de Ardósia", - "block.mineralogy.schist_relief_axe": "Relevo de Machado de Xisto", - "block.mineralogy.schist_relief_blank": "Relevo em Branco de Xisto", - "block.mineralogy.schist_relief_cross": "Cruzamento em Xisto", - "block.mineralogy.schist_relief_hammer": "Relevo do Martelo de Xisto", - "block.mineralogy.schist_relief_hoe": "Relevo de Enxada de Xisto", - "block.mineralogy.schist_relief_horizontal": "Relevo Horizontal de Xisto", - "block.mineralogy.schist_relief_i": "Relevo Xisto I", - "block.mineralogy.schist_relief_left": "Relevo Esquerdo de Xisto", - "block.mineralogy.schist_relief_pickaxe": "Relevo de Picareta de Xisto", - "block.mineralogy.schist_relief_plus": "Xisto Mais Alívio", - "block.mineralogy.schist_relief_right": "Relevo Direito do Xisto", - "block.mineralogy.schist_relief_sword": "Relevo da Espada de Xisto", - "block.mineralogy.schist_relief_vertical": "Relevo Vertical de Xisto", - "block.mineralogy.gneiss_relief_axe": "Relevo de machado de gnaisse", - "block.mineralogy.gneiss_relief_blank": "Relevo em branco de gnaisse", - "block.mineralogy.gneiss_relief_cross": "Relevo Cruzado Gnaisse", - "block.mineralogy.gneiss_relief_hammer": "Relevo do Martelo Gnaisse", - "block.mineralogy.gneiss_relief_hoe": "Relevo de enxada de gnaisse", - "block.mineralogy.gneiss_relief_horizontal": "Relevo Horizontal Gnaisse", - "block.mineralogy.gneiss_relief_i": "Gnaisse I Relevo", - "block.mineralogy.gneiss_relief_left": "Relevo Esquerdo do Gnaisse", - "block.mineralogy.gneiss_relief_pickaxe": "Alívio da Picareta Gnaisse", - "block.mineralogy.gneiss_relief_plus": "Gnaisse Plus Relevo", - "block.mineralogy.gneiss_relief_right": "Relevo direito do gnaisse", - "block.mineralogy.gneiss_relief_sword": "Relevo da Espada Gnaisse", - "block.mineralogy.gneiss_relief_vertical": "Relevo Vertical Gnaisse", - "block.mineralogy.phyllite_relief_axe": "Alívio de machado de filito", - "block.mineralogy.phyllite_relief_blank": "Relevo em branco de filito", - "block.mineralogy.phyllite_relief_cross": "Relevo Cruzado Filito", - "block.mineralogy.phyllite_relief_hammer": "Alívio do martelo filito", - "block.mineralogy.phyllite_relief_hoe": "Relevo de enxada de filito", - "block.mineralogy.phyllite_relief_horizontal": "Relevo Horizontal Filito", - "block.mineralogy.phyllite_relief_i": "Relevo Filito I", - "block.mineralogy.phyllite_relief_left": "Relevo esquerdo do filito", - "block.mineralogy.phyllite_relief_pickaxe": "Relevo de picareta filito", - "block.mineralogy.phyllite_relief_plus": "Filito Plus Alívio", - "block.mineralogy.phyllite_relief_right": "Relevo direito do filito", - "block.mineralogy.phyllite_relief_sword": "Relevo da Espada Filita", - "block.mineralogy.phyllite_relief_vertical": "Relevo Vertical Filito", - "block.mineralogy.amphibolite_relief_axe": "Alívio de Machado Anfibolito", - "block.mineralogy.amphibolite_relief_blank": "Relevo em Branco Anfibolito", - "block.mineralogy.amphibolite_relief_cross": "Relevo Cruzado Anfibolito", - "block.mineralogy.amphibolite_relief_hammer": "Alívio do Martelo Anfibolito", - "block.mineralogy.amphibolite_relief_hoe": "Alívio de enxada anfibolito", - "block.mineralogy.amphibolite_relief_horizontal": "Relevo Horizontal Anfibolito", - "block.mineralogy.amphibolite_relief_i": "Alívio Anfibolito I", - "block.mineralogy.amphibolite_relief_left": "Relevo Esquerdo Anfibolito", - "block.mineralogy.amphibolite_relief_pickaxe": "Alívio de Picareta Anfibolito", - "block.mineralogy.amphibolite_relief_plus": "Alívio Anfibolito Plus", - "block.mineralogy.amphibolite_relief_right": "Alívio Direito Anfibolito", - "block.mineralogy.amphibolite_relief_sword": "Alívio da Espada Anfibolita", - "block.mineralogy.amphibolite_relief_vertical": "Relevo Vertical Anfibolito", - "block.mineralogy.diabase_relief_axe": "Alívio do Machado de Diabásio", - "block.mineralogy.diabase_relief_blank": "Relevo em Branco de Diabásio", - "block.mineralogy.diabase_relief_cross": "Relevo Cruzado de Diabásio", - "block.mineralogy.diabase_relief_hammer": "Alívio do martelo de diabásio", - "block.mineralogy.diabase_relief_hoe": "Alívio da enxada de diabásio", - "block.mineralogy.diabase_relief_horizontal": "Diabásio Relevo Horizontal", - "block.mineralogy.diabase_relief_i": "Diabásio I Alívio", - "block.mineralogy.diabase_relief_left": "Diabásio Relevo Esquerdo", - "block.mineralogy.diabase_relief_pickaxe": "Alívio da Picareta de Diabásio", - "block.mineralogy.diabase_relief_plus": "Diabásio Plus Alívio", - "block.mineralogy.diabase_relief_right": "Diabásio Alívio Direito", - "block.mineralogy.diabase_relief_sword": "Alívio da Espada de Diabásio", - "block.mineralogy.diabase_relief_vertical": "Diabásio Relevo Vertical", - "block.mineralogy.gabbro_relief_axe": "Alívio do Machado Gabro", - "block.mineralogy.gabbro_relief_blank": "Gabbro em branco em relevo", - "block.mineralogy.gabbro_relief_cross": "Relevo Cruzado de Gabro", - "block.mineralogy.gabbro_relief_hammer": "Alívio do martelo gabro", - "block.mineralogy.gabbro_relief_hoe": "Alívio da enxada Gabbro", - "block.mineralogy.gabbro_relief_horizontal": "Gabro Relevo Horizontal", - "block.mineralogy.gabbro_relief_i": "Gabro I Alívio", - "block.mineralogy.gabbro_relief_left": "Gabbro deixou alívio", - "block.mineralogy.gabbro_relief_pickaxe": "Alívio da Picareta Gabbro", - "block.mineralogy.gabbro_relief_plus": "Gabro Plus Alívio", - "block.mineralogy.gabbro_relief_right": "Alívio direito de Gabbro", - "block.mineralogy.gabbro_relief_sword": "Alívio da Espada Gabbro", - "block.mineralogy.gabbro_relief_vertical": "Gabro Relevo Vertical", - "block.mineralogy.peridotite_relief_axe": "Alívio de machado de peridotita", - "block.mineralogy.peridotite_relief_blank": "Relevo em branco de peridotita", - "block.mineralogy.peridotite_relief_cross": "Relevo Cruzado de Peridotita", - "block.mineralogy.peridotite_relief_hammer": "Alívio de martelo de peridotita", - "block.mineralogy.peridotite_relief_hoe": "Alívio de enxada de peridotita", - "block.mineralogy.peridotite_relief_horizontal": "Relevo Horizontal Peridotita", - "block.mineralogy.peridotite_relief_i": "Relevo Peridotita I", - "block.mineralogy.peridotite_relief_left": "Relevo esquerdo de peridotita", - "block.mineralogy.peridotite_relief_pickaxe": "Alívio de Picareta Peridotita", - "block.mineralogy.peridotite_relief_plus": "Peridotita Plus Alívio", - "block.mineralogy.peridotite_relief_right": "Alívio direito de peridotita", - "block.mineralogy.peridotite_relief_sword": "Alívio da Espada Peridotita", - "block.mineralogy.peridotite_relief_vertical": "Relevo Vertical Peridotita", - "block.mineralogy.basaltic_glass_relief_axe": "Relevo de machado de vidro basáltico", - "block.mineralogy.basaltic_glass_relief_blank": "Relevo em branco de vidro basáltico", - "block.mineralogy.basaltic_glass_relief_cross": "Relevo Cruzado de Vidro Basáltico", - "block.mineralogy.basaltic_glass_relief_hammer": "Relevo de martelo de vidro basáltico", - "block.mineralogy.basaltic_glass_relief_hoe": "Relevo de enxada de vidro basáltico", - "block.mineralogy.basaltic_glass_relief_horizontal": "Relevo horizontal de vidro basáltico", - "block.mineralogy.basaltic_glass_relief_i": "Vidro Basáltico I Relevo", - "block.mineralogy.basaltic_glass_relief_left": "Relevo Esquerdo de Vidro Basáltico", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Relevo de picareta de vidro basáltico", - "block.mineralogy.basaltic_glass_relief_plus": "Vidro Basáltico Mais Relevo", - "block.mineralogy.basaltic_glass_relief_right": "Relevo direito do vidro basáltico", - "block.mineralogy.basaltic_glass_relief_sword": "Relevo de espada de vidro basáltico", - "block.mineralogy.basaltic_glass_relief_vertical": "Relevo vertical de vidro basáltico", - "block.mineralogy.scoria_relief_axe": "Alívio do machado de escória", - "block.mineralogy.scoria_relief_blank": "Alívio em branco de Scoria", - "block.mineralogy.scoria_relief_cross": "Relevo Cruzado de Escória", - "block.mineralogy.scoria_relief_hammer": "Alívio do martelo de escória", - "block.mineralogy.scoria_relief_hoe": "Alívio de enxada de Scoria", - "block.mineralogy.scoria_relief_horizontal": "Relevo horizontal da escória", - "block.mineralogy.scoria_relief_i": "Alívio da Escória I", - "block.mineralogy.scoria_relief_left": "Alívio Esquerdo de Scoria", - "block.mineralogy.scoria_relief_pickaxe": "Alívio da Picareta Scoria", - "block.mineralogy.scoria_relief_plus": "Alívio Scoria Plus", - "block.mineralogy.scoria_relief_right": "Alívio direito da escória", - "block.mineralogy.scoria_relief_sword": "Alívio da Espada Scoria", - "block.mineralogy.scoria_relief_vertical": "Relevo vertical da escória", - "block.mineralogy.tuff_relief_axe": "Alívio de machado de tufo", - "block.mineralogy.tuff_relief_blank": "Relevo em branco de tufo", - "block.mineralogy.tuff_relief_cross": "Relevo Cruzado em Tufo", - "block.mineralogy.tuff_relief_hammer": "Alívio do martelo tufo", - "block.mineralogy.tuff_relief_hoe": "Alívio de enxada de tufo", - "block.mineralogy.tuff_relief_horizontal": "Relevo Horizontal Tufo", - "block.mineralogy.tuff_relief_i": "Tufo I Alívio", - "block.mineralogy.tuff_relief_left": "Relevo esquerdo de tufo", - "block.mineralogy.tuff_relief_pickaxe": "Alívio de picareta de tufo", - "block.mineralogy.tuff_relief_plus": "Tuff Plus Alívio", - "block.mineralogy.tuff_relief_right": "Alívio direito do tufo", - "block.mineralogy.tuff_relief_sword": "Relevo de espada de tufo", - "block.mineralogy.tuff_relief_vertical": "Relevo Vertical Tufo", - "block.mineralogy.siltstone_relief_axe": "Alívio do Machado de Siltstone", - "block.mineralogy.siltstone_relief_blank": "Relevo em branco de siltito", - "block.mineralogy.siltstone_relief_cross": "Relevo Cruzado de Siltstone", - "block.mineralogy.siltstone_relief_hammer": "Alívio do Martelo de Siltstone", - "block.mineralogy.siltstone_relief_hoe": "Relevo de enxada de siltito", - "block.mineralogy.siltstone_relief_horizontal": "Relevo horizontal de siltito", - "block.mineralogy.siltstone_relief_i": "Siltstone I Relevo", - "block.mineralogy.siltstone_relief_left": "Relevo Esquerdo de Siltstone", - "block.mineralogy.siltstone_relief_pickaxe": "Alívio da Picareta de Siltstone", - "block.mineralogy.siltstone_relief_plus": "Siltstone Plus Alívio", - "block.mineralogy.siltstone_relief_right": "Relevo direito do siltito", - "block.mineralogy.siltstone_relief_sword": "Relevo da Espada de Siltstone", - "block.mineralogy.siltstone_relief_vertical": "Relevo vertical de siltito", - "block.mineralogy.rock_salt_relief_axe": "Alívio do machado de sal-gema", - "block.mineralogy.rock_salt_relief_blank": "Relevo em branco de sal-gema", - "block.mineralogy.rock_salt_relief_cross": "Relevo Cruzado de Sal-gema", - "block.mineralogy.rock_salt_relief_hammer": "Alívio do martelo de sal-gema", - "block.mineralogy.rock_salt_relief_hoe": "Alívio de enxada de sal-gema", - "block.mineralogy.rock_salt_relief_horizontal": "Relevo horizontal de sal-gema", - "block.mineralogy.rock_salt_relief_i": "Sal-gema I Relevo", - "block.mineralogy.rock_salt_relief_left": "Sal-gema à esquerda em relevo", - "block.mineralogy.rock_salt_relief_pickaxe": "Alívio da picareta de sal-gema", - "block.mineralogy.rock_salt_relief_plus": "Sal-gema mais alívio", - "block.mineralogy.rock_salt_relief_right": "Alívio direito de sal-gema", - "block.mineralogy.rock_salt_relief_sword": "Alívio da espada de sal-gema", - "block.mineralogy.rock_salt_relief_vertical": "Relevo vertical de sal-gema", - "block.mineralogy.hornfels_relief_axe": "Alívio do Machado Hornfels", - "block.mineralogy.hornfels_relief_blank": "Alívio em branco de Hornfels", - "block.mineralogy.hornfels_relief_cross": "Relevo Cruzado de Hornfels", - "block.mineralogy.hornfels_relief_hammer": "Alívio do Martelo Hornfels", - "block.mineralogy.hornfels_relief_hoe": "Alívio da enxada Hornfels", - "block.mineralogy.hornfels_relief_horizontal": "Relevo Horizontal Hornfels", - "block.mineralogy.hornfels_relief_i": "Hornfels I Alívio", - "block.mineralogy.hornfels_relief_left": "Alívio esquerdo de Hornfels", - "block.mineralogy.hornfels_relief_pickaxe": "Alívio da Picareta Hornfels", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus Alívio", - "block.mineralogy.hornfels_relief_right": "Alívio direito de Hornfels", - "block.mineralogy.hornfels_relief_sword": "Alívio da Espada Hornfels", - "block.mineralogy.hornfels_relief_vertical": "Relevo vertical de Hornfels", - "block.mineralogy.quartzite_relief_axe": "Relevo de machado de quartzito", - "block.mineralogy.quartzite_relief_blank": "Relevo em Branco de Quartzito", - "block.mineralogy.quartzite_relief_cross": "Relevo Cruzado em Quartzito", - "block.mineralogy.quartzite_relief_hammer": "Relevo de martelo de quartzito", - "block.mineralogy.quartzite_relief_hoe": "Relevo de enxada de quartzito", - "block.mineralogy.quartzite_relief_horizontal": "Relevo Horizontal Quartzito", - "block.mineralogy.quartzite_relief_i": "Quartzito I Relevo", - "block.mineralogy.quartzite_relief_left": "Quartzito Relevo Esquerdo", - "block.mineralogy.quartzite_relief_pickaxe": "Relevo de Picareta de Quartzito", - "block.mineralogy.quartzite_relief_plus": "Quartzito Mais Relevo", - "block.mineralogy.quartzite_relief_right": "Quartzito Relevo Direito", - "block.mineralogy.quartzite_relief_sword": "Relevo de Espada de Quartzito", - "block.mineralogy.quartzite_relief_vertical": "Relevo Vertical Quartzito", - "block.mineralogy.novaculite_relief_axe": "Alívio de Machado de Novaculita", - "block.mineralogy.novaculite_relief_blank": "Relevo em branco de Novaculita", - "block.mineralogy.novaculite_relief_cross": "Relevo Cruzado de Novaculita", - "block.mineralogy.novaculite_relief_hammer": "Alívio do martelo de novaculita", - "block.mineralogy.novaculite_relief_hoe": "Alívio de enxada de novaculita", - "block.mineralogy.novaculite_relief_horizontal": "Relevo Horizontal Novaculita", - "block.mineralogy.novaculite_relief_i": "Novaculita I Alívio", - "block.mineralogy.novaculite_relief_left": "Novaculita em relevo esquerdo", - "block.mineralogy.novaculite_relief_pickaxe": "Alívio da Picareta Novaculita", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus Alívio", - "block.mineralogy.novaculite_relief_right": "Alívio Direito de Novaculita", - "block.mineralogy.novaculite_relief_sword": "Alívio da Espada Novaculita", - "block.mineralogy.novaculite_relief_vertical": "Novaculita Relevo Vertical", - "advancements.mineralogy.all_the_rocks.title": "Chame as pedras de Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Uau, você encontrou todos os tipos de rochas padrão na Mineralogia!", - "fluid.mineralogy.crude_oil": "Petróleo Bruto", - "block.mineralogy.crude_oil": "Petróleo Bruto", - "item.mineralogy.crude_oil_bucket": "Balde de petróleo bruto", + "block.mineralogy.rocksaltlamp": "Luminária de sal-gema", + "block.mineralogy.rocksaltstreetlamp": "Poste de luz de sal-gema", + "block.mineralogy.andesite_relief_axe": "Baixo-relevo de Andesito (machado)", + "block.mineralogy.andesite_relief_blank": "Baixo-relevo de Andesito (sem motivo)", + "block.mineralogy.andesite_relief_cross": "Baixo-relevo de Andesito (cruz)", + "block.mineralogy.andesite_relief_hammer": "Baixo-relevo de Andesito (martelo)", + "block.mineralogy.andesite_relief_hoe": "Baixo-relevo de Andesito (enxada)", + "block.mineralogy.andesite_relief_horizontal": "Baixo-relevo de Andesito (horizontal)", + "block.mineralogy.andesite_relief_i": "Baixo-relevo de Andesito (I)", + "block.mineralogy.andesite_relief_left": "Baixo-relevo de Andesito (esquerda)", + "block.mineralogy.andesite_relief_pickaxe": "Baixo-relevo de Andesito (picareta)", + "block.mineralogy.andesite_relief_plus": "Baixo-relevo de Andesito (sinal de mais)", + "block.mineralogy.andesite_relief_right": "Baixo-relevo de Andesito (direita)", + "block.mineralogy.andesite_relief_sword": "Baixo-relevo de Andesito (espada)", + "block.mineralogy.andesite_relief_vertical": "Baixo-relevo de Andesito (vertical)", + "block.mineralogy.basalt_relief_axe": "Baixo-relevo de Basalto (machado)", + "block.mineralogy.basalt_relief_blank": "Baixo-relevo de Basalto (sem motivo)", + "block.mineralogy.basalt_relief_cross": "Baixo-relevo de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Baixo-relevo de Basalto (martelo)", + "block.mineralogy.basalt_relief_hoe": "Baixo-relevo de Basalto (enxada)", + "block.mineralogy.basalt_relief_horizontal": "Baixo-relevo de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Baixo-relevo de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Baixo-relevo de Basalto (esquerda)", + "block.mineralogy.basalt_relief_pickaxe": "Baixo-relevo de Basalto (picareta)", + "block.mineralogy.basalt_relief_plus": "Baixo-relevo de Basalto (sinal de mais)", + "block.mineralogy.basalt_relief_right": "Baixo-relevo de Basalto (direita)", + "block.mineralogy.basalt_relief_sword": "Baixo-relevo de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Baixo-relevo de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Baixo-relevo de Diorito (machado)", + "block.mineralogy.diorite_relief_blank": "Baixo-relevo de Diorito (sem motivo)", + "block.mineralogy.diorite_relief_cross": "Baixo-relevo de Diorito (cruz)", + "block.mineralogy.diorite_relief_hammer": "Baixo-relevo de Diorito (martelo)", + "block.mineralogy.diorite_relief_hoe": "Baixo-relevo de Diorito (enxada)", + "block.mineralogy.diorite_relief_horizontal": "Baixo-relevo de Diorito (horizontal)", + "block.mineralogy.diorite_relief_i": "Baixo-relevo de Diorito (I)", + "block.mineralogy.diorite_relief_left": "Baixo-relevo de Diorito (esquerda)", + "block.mineralogy.diorite_relief_pickaxe": "Baixo-relevo de Diorito (picareta)", + "block.mineralogy.diorite_relief_plus": "Baixo-relevo de Diorito (sinal de mais)", + "block.mineralogy.diorite_relief_right": "Baixo-relevo de Diorito (direita)", + "block.mineralogy.diorite_relief_sword": "Baixo-relevo de Diorito (espada)", + "block.mineralogy.diorite_relief_vertical": "Baixo-relevo de Diorito (vertical)", + "block.mineralogy.granite_relief_axe": "Baixo-relevo de Granito (machado)", + "block.mineralogy.granite_relief_blank": "Baixo-relevo de Granito (sem motivo)", + "block.mineralogy.granite_relief_cross": "Baixo-relevo de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Baixo-relevo de Granito (martelo)", + "block.mineralogy.granite_relief_hoe": "Baixo-relevo de Granito (enxada)", + "block.mineralogy.granite_relief_horizontal": "Baixo-relevo de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Baixo-relevo de Granito (I)", + "block.mineralogy.granite_relief_left": "Baixo-relevo de Granito (esquerda)", + "block.mineralogy.granite_relief_pickaxe": "Baixo-relevo de Granito (picareta)", + "block.mineralogy.granite_relief_plus": "Baixo-relevo de Granito (sinal de mais)", + "block.mineralogy.granite_relief_right": "Baixo-relevo de Granito (direita)", + "block.mineralogy.granite_relief_sword": "Baixo-relevo de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Baixo-relevo de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Baixo-relevo de Riolito (machado)", + "block.mineralogy.rhyolite_relief_blank": "Baixo-relevo de Riolito (sem motivo)", + "block.mineralogy.rhyolite_relief_cross": "Baixo-relevo de Riolito (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Baixo-relevo de Riolito (martelo)", + "block.mineralogy.rhyolite_relief_hoe": "Baixo-relevo de Riolito (enxada)", + "block.mineralogy.rhyolite_relief_horizontal": "Baixo-relevo de Riolito (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Baixo-relevo de Riolito (I)", + "block.mineralogy.rhyolite_relief_left": "Baixo-relevo de Riolito (esquerda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Baixo-relevo de Riolito (picareta)", + "block.mineralogy.rhyolite_relief_plus": "Baixo-relevo de Riolito (sinal de mais)", + "block.mineralogy.rhyolite_relief_right": "Baixo-relevo de Riolito (direita)", + "block.mineralogy.rhyolite_relief_sword": "Baixo-relevo de Riolito (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Baixo-relevo de Riolito (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Baixo-relevo de Pegmatito (machado)", + "block.mineralogy.pegmatite_relief_blank": "Baixo-relevo de Pegmatito (sem motivo)", + "block.mineralogy.pegmatite_relief_cross": "Baixo-relevo de Pegmatito (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Baixo-relevo de Pegmatito (martelo)", + "block.mineralogy.pegmatite_relief_hoe": "Baixo-relevo de Pegmatito (enxada)", + "block.mineralogy.pegmatite_relief_horizontal": "Baixo-relevo de Pegmatito (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Baixo-relevo de Pegmatito (I)", + "block.mineralogy.pegmatite_relief_left": "Baixo-relevo de Pegmatito (esquerda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Baixo-relevo de Pegmatito (picareta)", + "block.mineralogy.pegmatite_relief_plus": "Baixo-relevo de Pegmatito (sinal de mais)", + "block.mineralogy.pegmatite_relief_right": "Baixo-relevo de Pegmatito (direita)", + "block.mineralogy.pegmatite_relief_sword": "Baixo-relevo de Pegmatito (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Baixo-relevo de Pegmatito (vertical)", + "block.mineralogy.shale_relief_axe": "Baixo-relevo de Folhelho (machado)", + "block.mineralogy.shale_relief_blank": "Baixo-relevo de Folhelho (sem motivo)", + "block.mineralogy.shale_relief_cross": "Baixo-relevo de Folhelho (cruz)", + "block.mineralogy.shale_relief_hammer": "Baixo-relevo de Folhelho (martelo)", + "block.mineralogy.shale_relief_hoe": "Baixo-relevo de Folhelho (enxada)", + "block.mineralogy.shale_relief_horizontal": "Baixo-relevo de Folhelho (horizontal)", + "block.mineralogy.shale_relief_i": "Baixo-relevo de Folhelho (I)", + "block.mineralogy.shale_relief_left": "Baixo-relevo de Folhelho (esquerda)", + "block.mineralogy.shale_relief_pickaxe": "Baixo-relevo de Folhelho (picareta)", + "block.mineralogy.shale_relief_plus": "Baixo-relevo de Folhelho (sinal de mais)", + "block.mineralogy.shale_relief_right": "Baixo-relevo de Folhelho (direita)", + "block.mineralogy.shale_relief_sword": "Baixo-relevo de Folhelho (espada)", + "block.mineralogy.shale_relief_vertical": "Baixo-relevo de Folhelho (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Baixo-relevo de Conglomerado (machado)", + "block.mineralogy.conglomerate_relief_blank": "Baixo-relevo de Conglomerado (sem motivo)", + "block.mineralogy.conglomerate_relief_cross": "Baixo-relevo de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Baixo-relevo de Conglomerado (martelo)", + "block.mineralogy.conglomerate_relief_hoe": "Baixo-relevo de Conglomerado (enxada)", + "block.mineralogy.conglomerate_relief_horizontal": "Baixo-relevo de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Baixo-relevo de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Baixo-relevo de Conglomerado (esquerda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Baixo-relevo de Conglomerado (picareta)", + "block.mineralogy.conglomerate_relief_plus": "Baixo-relevo de Conglomerado (sinal de mais)", + "block.mineralogy.conglomerate_relief_right": "Baixo-relevo de Conglomerado (direita)", + "block.mineralogy.conglomerate_relief_sword": "Baixo-relevo de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Baixo-relevo de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Baixo-relevo de Dolomita (machado)", + "block.mineralogy.dolomite_relief_blank": "Baixo-relevo de Dolomita (sem motivo)", + "block.mineralogy.dolomite_relief_cross": "Baixo-relevo de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Baixo-relevo de Dolomita (martelo)", + "block.mineralogy.dolomite_relief_hoe": "Baixo-relevo de Dolomita (enxada)", + "block.mineralogy.dolomite_relief_horizontal": "Baixo-relevo de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Baixo-relevo de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Baixo-relevo de Dolomita (esquerda)", + "block.mineralogy.dolomite_relief_pickaxe": "Baixo-relevo de Dolomita (picareta)", + "block.mineralogy.dolomite_relief_plus": "Baixo-relevo de Dolomita (sinal de mais)", + "block.mineralogy.dolomite_relief_right": "Baixo-relevo de Dolomita (direita)", + "block.mineralogy.dolomite_relief_sword": "Baixo-relevo de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Baixo-relevo de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Baixo-relevo de Calcário (machado)", + "block.mineralogy.limestone_relief_blank": "Baixo-relevo de Calcário (sem motivo)", + "block.mineralogy.limestone_relief_cross": "Baixo-relevo de Calcário (cruz)", + "block.mineralogy.limestone_relief_hammer": "Baixo-relevo de Calcário (martelo)", + "block.mineralogy.limestone_relief_hoe": "Baixo-relevo de Calcário (enxada)", + "block.mineralogy.limestone_relief_horizontal": "Baixo-relevo de Calcário (horizontal)", + "block.mineralogy.limestone_relief_i": "Baixo-relevo de Calcário (I)", + "block.mineralogy.limestone_relief_left": "Baixo-relevo de Calcário (esquerda)", + "block.mineralogy.limestone_relief_pickaxe": "Baixo-relevo de Calcário (picareta)", + "block.mineralogy.limestone_relief_plus": "Baixo-relevo de Calcário (sinal de mais)", + "block.mineralogy.limestone_relief_right": "Baixo-relevo de Calcário (direita)", + "block.mineralogy.limestone_relief_sword": "Baixo-relevo de Calcário (espada)", + "block.mineralogy.limestone_relief_vertical": "Baixo-relevo de Calcário (vertical)", + "block.mineralogy.marble_relief_axe": "Baixo-relevo de Mármore (machado)", + "block.mineralogy.marble_relief_blank": "Baixo-relevo de Mármore (sem motivo)", + "block.mineralogy.marble_relief_cross": "Baixo-relevo de Mármore (cruz)", + "block.mineralogy.marble_relief_hammer": "Baixo-relevo de Mármore (martelo)", + "block.mineralogy.marble_relief_hoe": "Baixo-relevo de Mármore (enxada)", + "block.mineralogy.marble_relief_horizontal": "Baixo-relevo de Mármore (horizontal)", + "block.mineralogy.marble_relief_i": "Baixo-relevo de Mármore (I)", + "block.mineralogy.marble_relief_left": "Baixo-relevo de Mármore (esquerda)", + "block.mineralogy.marble_relief_pickaxe": "Baixo-relevo de Mármore (picareta)", + "block.mineralogy.marble_relief_plus": "Baixo-relevo de Mármore (sinal de mais)", + "block.mineralogy.marble_relief_right": "Baixo-relevo de Mármore (direita)", + "block.mineralogy.marble_relief_sword": "Baixo-relevo de Mármore (espada)", + "block.mineralogy.marble_relief_vertical": "Baixo-relevo de Mármore (vertical)", + "block.mineralogy.slate_relief_axe": "Baixo-relevo de Ardósia (machado)", + "block.mineralogy.slate_relief_blank": "Baixo-relevo de Ardósia (sem motivo)", + "block.mineralogy.slate_relief_cross": "Baixo-relevo de Ardósia (cruz)", + "block.mineralogy.slate_relief_hammer": "Baixo-relevo de Ardósia (martelo)", + "block.mineralogy.slate_relief_hoe": "Baixo-relevo de Ardósia (enxada)", + "block.mineralogy.slate_relief_horizontal": "Baixo-relevo de Ardósia (horizontal)", + "block.mineralogy.slate_relief_i": "Baixo-relevo de Ardósia (I)", + "block.mineralogy.slate_relief_left": "Baixo-relevo de Ardósia (esquerda)", + "block.mineralogy.slate_relief_pickaxe": "Baixo-relevo de Ardósia (picareta)", + "block.mineralogy.slate_relief_plus": "Baixo-relevo de Ardósia (sinal de mais)", + "block.mineralogy.slate_relief_right": "Baixo-relevo de Ardósia (direita)", + "block.mineralogy.slate_relief_sword": "Baixo-relevo de Ardósia (espada)", + "block.mineralogy.slate_relief_vertical": "Baixo-relevo de Ardósia (vertical)", + "block.mineralogy.schist_relief_axe": "Baixo-relevo de Xisto (machado)", + "block.mineralogy.schist_relief_blank": "Baixo-relevo de Xisto (sem motivo)", + "block.mineralogy.schist_relief_cross": "Baixo-relevo de Xisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Baixo-relevo de Xisto (martelo)", + "block.mineralogy.schist_relief_hoe": "Baixo-relevo de Xisto (enxada)", + "block.mineralogy.schist_relief_horizontal": "Baixo-relevo de Xisto (horizontal)", + "block.mineralogy.schist_relief_i": "Baixo-relevo de Xisto (I)", + "block.mineralogy.schist_relief_left": "Baixo-relevo de Xisto (esquerda)", + "block.mineralogy.schist_relief_pickaxe": "Baixo-relevo de Xisto (picareta)", + "block.mineralogy.schist_relief_plus": "Baixo-relevo de Xisto (sinal de mais)", + "block.mineralogy.schist_relief_right": "Baixo-relevo de Xisto (direita)", + "block.mineralogy.schist_relief_sword": "Baixo-relevo de Xisto (espada)", + "block.mineralogy.schist_relief_vertical": "Baixo-relevo de Xisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Baixo-relevo de Gnaisse (machado)", + "block.mineralogy.gneiss_relief_blank": "Baixo-relevo de Gnaisse (sem motivo)", + "block.mineralogy.gneiss_relief_cross": "Baixo-relevo de Gnaisse (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Baixo-relevo de Gnaisse (martelo)", + "block.mineralogy.gneiss_relief_hoe": "Baixo-relevo de Gnaisse (enxada)", + "block.mineralogy.gneiss_relief_horizontal": "Baixo-relevo de Gnaisse (horizontal)", + "block.mineralogy.gneiss_relief_i": "Baixo-relevo de Gnaisse (I)", + "block.mineralogy.gneiss_relief_left": "Baixo-relevo de Gnaisse (esquerda)", + "block.mineralogy.gneiss_relief_pickaxe": "Baixo-relevo de Gnaisse (picareta)", + "block.mineralogy.gneiss_relief_plus": "Baixo-relevo de Gnaisse (sinal de mais)", + "block.mineralogy.gneiss_relief_right": "Baixo-relevo de Gnaisse (direita)", + "block.mineralogy.gneiss_relief_sword": "Baixo-relevo de Gnaisse (espada)", + "block.mineralogy.gneiss_relief_vertical": "Baixo-relevo de Gnaisse (vertical)", + "block.mineralogy.phyllite_relief_axe": "Baixo-relevo de Filito (machado)", + "block.mineralogy.phyllite_relief_blank": "Baixo-relevo de Filito (sem motivo)", + "block.mineralogy.phyllite_relief_cross": "Baixo-relevo de Filito (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Baixo-relevo de Filito (martelo)", + "block.mineralogy.phyllite_relief_hoe": "Baixo-relevo de Filito (enxada)", + "block.mineralogy.phyllite_relief_horizontal": "Baixo-relevo de Filito (horizontal)", + "block.mineralogy.phyllite_relief_i": "Baixo-relevo de Filito (I)", + "block.mineralogy.phyllite_relief_left": "Baixo-relevo de Filito (esquerda)", + "block.mineralogy.phyllite_relief_pickaxe": "Baixo-relevo de Filito (picareta)", + "block.mineralogy.phyllite_relief_plus": "Baixo-relevo de Filito (sinal de mais)", + "block.mineralogy.phyllite_relief_right": "Baixo-relevo de Filito (direita)", + "block.mineralogy.phyllite_relief_sword": "Baixo-relevo de Filito (espada)", + "block.mineralogy.phyllite_relief_vertical": "Baixo-relevo de Filito (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Baixo-relevo de Anfibolito (machado)", + "block.mineralogy.amphibolite_relief_blank": "Baixo-relevo de Anfibolito (sem motivo)", + "block.mineralogy.amphibolite_relief_cross": "Baixo-relevo de Anfibolito (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Baixo-relevo de Anfibolito (martelo)", + "block.mineralogy.amphibolite_relief_hoe": "Baixo-relevo de Anfibolito (enxada)", + "block.mineralogy.amphibolite_relief_horizontal": "Baixo-relevo de Anfibolito (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Baixo-relevo de Anfibolito (I)", + "block.mineralogy.amphibolite_relief_left": "Baixo-relevo de Anfibolito (esquerda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Baixo-relevo de Anfibolito (picareta)", + "block.mineralogy.amphibolite_relief_plus": "Baixo-relevo de Anfibolito (sinal de mais)", + "block.mineralogy.amphibolite_relief_right": "Baixo-relevo de Anfibolito (direita)", + "block.mineralogy.amphibolite_relief_sword": "Baixo-relevo de Anfibolito (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Baixo-relevo de Anfibolito (vertical)", + "block.mineralogy.diabase_relief_axe": "Baixo-relevo de Diabásio (machado)", + "block.mineralogy.diabase_relief_blank": "Baixo-relevo de Diabásio (sem motivo)", + "block.mineralogy.diabase_relief_cross": "Baixo-relevo de Diabásio (cruz)", + "block.mineralogy.diabase_relief_hammer": "Baixo-relevo de Diabásio (martelo)", + "block.mineralogy.diabase_relief_hoe": "Baixo-relevo de Diabásio (enxada)", + "block.mineralogy.diabase_relief_horizontal": "Baixo-relevo de Diabásio (horizontal)", + "block.mineralogy.diabase_relief_i": "Baixo-relevo de Diabásio (I)", + "block.mineralogy.diabase_relief_left": "Baixo-relevo de Diabásio (esquerda)", + "block.mineralogy.diabase_relief_pickaxe": "Baixo-relevo de Diabásio (picareta)", + "block.mineralogy.diabase_relief_plus": "Baixo-relevo de Diabásio (sinal de mais)", + "block.mineralogy.diabase_relief_right": "Baixo-relevo de Diabásio (direita)", + "block.mineralogy.diabase_relief_sword": "Baixo-relevo de Diabásio (espada)", + "block.mineralogy.diabase_relief_vertical": "Baixo-relevo de Diabásio (vertical)", + "block.mineralogy.gabbro_relief_axe": "Baixo-relevo de Gabro (machado)", + "block.mineralogy.gabbro_relief_blank": "Baixo-relevo de Gabro (sem motivo)", + "block.mineralogy.gabbro_relief_cross": "Baixo-relevo de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Baixo-relevo de Gabro (martelo)", + "block.mineralogy.gabbro_relief_hoe": "Baixo-relevo de Gabro (enxada)", + "block.mineralogy.gabbro_relief_horizontal": "Baixo-relevo de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Baixo-relevo de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Baixo-relevo de Gabro (esquerda)", + "block.mineralogy.gabbro_relief_pickaxe": "Baixo-relevo de Gabro (picareta)", + "block.mineralogy.gabbro_relief_plus": "Baixo-relevo de Gabro (sinal de mais)", + "block.mineralogy.gabbro_relief_right": "Baixo-relevo de Gabro (direita)", + "block.mineralogy.gabbro_relief_sword": "Baixo-relevo de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Baixo-relevo de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Baixo-relevo de Peridotito (machado)", + "block.mineralogy.peridotite_relief_blank": "Baixo-relevo de Peridotito (sem motivo)", + "block.mineralogy.peridotite_relief_cross": "Baixo-relevo de Peridotito (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Baixo-relevo de Peridotito (martelo)", + "block.mineralogy.peridotite_relief_hoe": "Baixo-relevo de Peridotito (enxada)", + "block.mineralogy.peridotite_relief_horizontal": "Baixo-relevo de Peridotito (horizontal)", + "block.mineralogy.peridotite_relief_i": "Baixo-relevo de Peridotito (I)", + "block.mineralogy.peridotite_relief_left": "Baixo-relevo de Peridotito (esquerda)", + "block.mineralogy.peridotite_relief_pickaxe": "Baixo-relevo de Peridotito (picareta)", + "block.mineralogy.peridotite_relief_plus": "Baixo-relevo de Peridotito (sinal de mais)", + "block.mineralogy.peridotite_relief_right": "Baixo-relevo de Peridotito (direita)", + "block.mineralogy.peridotite_relief_sword": "Baixo-relevo de Peridotito (espada)", + "block.mineralogy.peridotite_relief_vertical": "Baixo-relevo de Peridotito (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Baixo-relevo de Vidro basáltico (machado)", + "block.mineralogy.basaltic_glass_relief_blank": "Baixo-relevo de Vidro basáltico (sem motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Baixo-relevo de Vidro basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Baixo-relevo de Vidro basáltico (martelo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Baixo-relevo de Vidro basáltico (enxada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Baixo-relevo de Vidro basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Baixo-relevo de Vidro basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Baixo-relevo de Vidro basáltico (esquerda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Baixo-relevo de Vidro basáltico (picareta)", + "block.mineralogy.basaltic_glass_relief_plus": "Baixo-relevo de Vidro basáltico (sinal de mais)", + "block.mineralogy.basaltic_glass_relief_right": "Baixo-relevo de Vidro basáltico (direita)", + "block.mineralogy.basaltic_glass_relief_sword": "Baixo-relevo de Vidro basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Baixo-relevo de Vidro basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Baixo-relevo de Escória (machado)", + "block.mineralogy.scoria_relief_blank": "Baixo-relevo de Escória (sem motivo)", + "block.mineralogy.scoria_relief_cross": "Baixo-relevo de Escória (cruz)", + "block.mineralogy.scoria_relief_hammer": "Baixo-relevo de Escória (martelo)", + "block.mineralogy.scoria_relief_hoe": "Baixo-relevo de Escória (enxada)", + "block.mineralogy.scoria_relief_horizontal": "Baixo-relevo de Escória (horizontal)", + "block.mineralogy.scoria_relief_i": "Baixo-relevo de Escória (I)", + "block.mineralogy.scoria_relief_left": "Baixo-relevo de Escória (esquerda)", + "block.mineralogy.scoria_relief_pickaxe": "Baixo-relevo de Escória (picareta)", + "block.mineralogy.scoria_relief_plus": "Baixo-relevo de Escória (sinal de mais)", + "block.mineralogy.scoria_relief_right": "Baixo-relevo de Escória (direita)", + "block.mineralogy.scoria_relief_sword": "Baixo-relevo de Escória (espada)", + "block.mineralogy.scoria_relief_vertical": "Baixo-relevo de Escória (vertical)", + "block.mineralogy.tuff_relief_axe": "Baixo-relevo de Tufo (machado)", + "block.mineralogy.tuff_relief_blank": "Baixo-relevo de Tufo (sem motivo)", + "block.mineralogy.tuff_relief_cross": "Baixo-relevo de Tufo (cruz)", + "block.mineralogy.tuff_relief_hammer": "Baixo-relevo de Tufo (martelo)", + "block.mineralogy.tuff_relief_hoe": "Baixo-relevo de Tufo (enxada)", + "block.mineralogy.tuff_relief_horizontal": "Baixo-relevo de Tufo (horizontal)", + "block.mineralogy.tuff_relief_i": "Baixo-relevo de Tufo (I)", + "block.mineralogy.tuff_relief_left": "Baixo-relevo de Tufo (esquerda)", + "block.mineralogy.tuff_relief_pickaxe": "Baixo-relevo de Tufo (picareta)", + "block.mineralogy.tuff_relief_plus": "Baixo-relevo de Tufo (sinal de mais)", + "block.mineralogy.tuff_relief_right": "Baixo-relevo de Tufo (direita)", + "block.mineralogy.tuff_relief_sword": "Baixo-relevo de Tufo (espada)", + "block.mineralogy.tuff_relief_vertical": "Baixo-relevo de Tufo (vertical)", + "block.mineralogy.siltstone_relief_axe": "Baixo-relevo de Siltito (machado)", + "block.mineralogy.siltstone_relief_blank": "Baixo-relevo de Siltito (sem motivo)", + "block.mineralogy.siltstone_relief_cross": "Baixo-relevo de Siltito (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Baixo-relevo de Siltito (martelo)", + "block.mineralogy.siltstone_relief_hoe": "Baixo-relevo de Siltito (enxada)", + "block.mineralogy.siltstone_relief_horizontal": "Baixo-relevo de Siltito (horizontal)", + "block.mineralogy.siltstone_relief_i": "Baixo-relevo de Siltito (I)", + "block.mineralogy.siltstone_relief_left": "Baixo-relevo de Siltito (esquerda)", + "block.mineralogy.siltstone_relief_pickaxe": "Baixo-relevo de Siltito (picareta)", + "block.mineralogy.siltstone_relief_plus": "Baixo-relevo de Siltito (sinal de mais)", + "block.mineralogy.siltstone_relief_right": "Baixo-relevo de Siltito (direita)", + "block.mineralogy.siltstone_relief_sword": "Baixo-relevo de Siltito (espada)", + "block.mineralogy.siltstone_relief_vertical": "Baixo-relevo de Siltito (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Baixo-relevo de Sal-gema (machado)", + "block.mineralogy.rock_salt_relief_blank": "Baixo-relevo de Sal-gema (sem motivo)", + "block.mineralogy.rock_salt_relief_cross": "Baixo-relevo de Sal-gema (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Baixo-relevo de Sal-gema (martelo)", + "block.mineralogy.rock_salt_relief_hoe": "Baixo-relevo de Sal-gema (enxada)", + "block.mineralogy.rock_salt_relief_horizontal": "Baixo-relevo de Sal-gema (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Baixo-relevo de Sal-gema (I)", + "block.mineralogy.rock_salt_relief_left": "Baixo-relevo de Sal-gema (esquerda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Baixo-relevo de Sal-gema (picareta)", + "block.mineralogy.rock_salt_relief_plus": "Baixo-relevo de Sal-gema (sinal de mais)", + "block.mineralogy.rock_salt_relief_right": "Baixo-relevo de Sal-gema (direita)", + "block.mineralogy.rock_salt_relief_sword": "Baixo-relevo de Sal-gema (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Baixo-relevo de Sal-gema (vertical)", + "block.mineralogy.hornfels_relief_axe": "Baixo-relevo de Cornubianito (machado)", + "block.mineralogy.hornfels_relief_blank": "Baixo-relevo de Cornubianito (sem motivo)", + "block.mineralogy.hornfels_relief_cross": "Baixo-relevo de Cornubianito (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Baixo-relevo de Cornubianito (martelo)", + "block.mineralogy.hornfels_relief_hoe": "Baixo-relevo de Cornubianito (enxada)", + "block.mineralogy.hornfels_relief_horizontal": "Baixo-relevo de Cornubianito (horizontal)", + "block.mineralogy.hornfels_relief_i": "Baixo-relevo de Cornubianito (I)", + "block.mineralogy.hornfels_relief_left": "Baixo-relevo de Cornubianito (esquerda)", + "block.mineralogy.hornfels_relief_pickaxe": "Baixo-relevo de Cornubianito (picareta)", + "block.mineralogy.hornfels_relief_plus": "Baixo-relevo de Cornubianito (sinal de mais)", + "block.mineralogy.hornfels_relief_right": "Baixo-relevo de Cornubianito (direita)", + "block.mineralogy.hornfels_relief_sword": "Baixo-relevo de Cornubianito (espada)", + "block.mineralogy.hornfels_relief_vertical": "Baixo-relevo de Cornubianito (vertical)", + "block.mineralogy.quartzite_relief_axe": "Baixo-relevo de Quartzito (machado)", + "block.mineralogy.quartzite_relief_blank": "Baixo-relevo de Quartzito (sem motivo)", + "block.mineralogy.quartzite_relief_cross": "Baixo-relevo de Quartzito (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Baixo-relevo de Quartzito (martelo)", + "block.mineralogy.quartzite_relief_hoe": "Baixo-relevo de Quartzito (enxada)", + "block.mineralogy.quartzite_relief_horizontal": "Baixo-relevo de Quartzito (horizontal)", + "block.mineralogy.quartzite_relief_i": "Baixo-relevo de Quartzito (I)", + "block.mineralogy.quartzite_relief_left": "Baixo-relevo de Quartzito (esquerda)", + "block.mineralogy.quartzite_relief_pickaxe": "Baixo-relevo de Quartzito (picareta)", + "block.mineralogy.quartzite_relief_plus": "Baixo-relevo de Quartzito (sinal de mais)", + "block.mineralogy.quartzite_relief_right": "Baixo-relevo de Quartzito (direita)", + "block.mineralogy.quartzite_relief_sword": "Baixo-relevo de Quartzito (espada)", + "block.mineralogy.quartzite_relief_vertical": "Baixo-relevo de Quartzito (vertical)", + "block.mineralogy.novaculite_relief_axe": "Baixo-relevo de Novaculita (machado)", + "block.mineralogy.novaculite_relief_blank": "Baixo-relevo de Novaculita (sem motivo)", + "block.mineralogy.novaculite_relief_cross": "Baixo-relevo de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Baixo-relevo de Novaculita (martelo)", + "block.mineralogy.novaculite_relief_hoe": "Baixo-relevo de Novaculita (enxada)", + "block.mineralogy.novaculite_relief_horizontal": "Baixo-relevo de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Baixo-relevo de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Baixo-relevo de Novaculita (esquerda)", + "block.mineralogy.novaculite_relief_pickaxe": "Baixo-relevo de Novaculita (picareta)", + "block.mineralogy.novaculite_relief_plus": "Baixo-relevo de Novaculita (sinal de mais)", + "block.mineralogy.novaculite_relief_right": "Baixo-relevo de Novaculita (direita)", + "block.mineralogy.novaculite_relief_sword": "Baixo-relevo de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Baixo-relevo de Novaculita (vertical)", "itemGroup.mineralogy.mineralogy": "Mineralogia", - "itemGroup.mineralogy.rock": "Rochas Mineralógicas", - "itemGroup.mineralogy.stair": "Escadas de Mineralogia", - "itemGroup.mineralogy.slab": "Lajes de Mineralogia", - "itemGroup.mineralogy.wall": "Paredes de Mineralogia", - "itemGroup.mineralogy.item": "Itens de mineralogia" + "itemGroup.mineralogy.rock": "Rochas da Mineralogia", + "itemGroup.mineralogy.stair": "Escadas da Mineralogia", + "itemGroup.mineralogy.slab": "Lajes da Mineralogia", + "itemGroup.mineralogy.wall": "Muros da Mineralogia", + "itemGroup.mineralogy.item": "Itens da Mineralogia", + "block.mineralogy.crude_oil": "Petróleo bruto", + "item.mineralogy.crude_oil_bucket": "Balde de petróleo bruto", + "fluid.mineralogy.crude_oil": "Petróleo bruto", + "advancements.mineralogy.all_the_rocks.title": "Todas as rochas", + "advancements.mineralogy.all_the_rocks.description": "Você encontrou todos os tipos de rocha padrão do Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/pt_pt.json b/src/main/resources/assets/mineralogy/lang/pt_pt.json new file mode 100644 index 000000000..867e9ac0d --- /dev/null +++ b/src/main/resources/assets/mineralogy/lang/pt_pt.json @@ -0,0 +1,940 @@ +{ + "block.mineralogy.andesite": "Andesito", + "block.mineralogy.andesite_stairs": "Escadas de Andesito", + "block.mineralogy.andesite_slab": "Laje de Andesito", + "block.mineralogy.andesite_brick": "Tijolos de Andesito", + "block.mineralogy.andesite_brick_stairs": "Escadas de tijolos de Andesito", + "block.mineralogy.andesite_brick_slab": "Laje de tijolos de Andesito", + "block.mineralogy.andesite_smooth": "Bloco polido de Andesito", + "block.mineralogy.andesite_smooth_stairs": "Escadas polidas de Andesito", + "block.mineralogy.andesite_smooth_slab": "Laje polida de Andesito", + "block.mineralogy.andesite_smooth_brick": "Tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_stairs": "Escadas de tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_slab": "Laje de tijolos polidos de Andesito", + "block.mineralogy.basalt": "Basalto", + "block.mineralogy.basalt_stairs": "Escadas de Basalto", + "block.mineralogy.basalt_slab": "Laje de Basalto", + "block.mineralogy.basalt_brick": "Tijolos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escadas de tijolos de Basalto", + "block.mineralogy.basalt_brick_slab": "Laje de tijolos de Basalto", + "block.mineralogy.basalt_smooth": "Bloco polido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escadas polidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Laje polida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escadas de tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Laje de tijolos polidos de Basalto", + "block.mineralogy.diorite": "Diorito", + "block.mineralogy.diorite_stairs": "Escadas de Diorito", + "block.mineralogy.diorite_slab": "Laje de Diorito", + "block.mineralogy.diorite_brick": "Tijolos de Diorito", + "block.mineralogy.diorite_brick_stairs": "Escadas de tijolos de Diorito", + "block.mineralogy.diorite_brick_slab": "Laje de tijolos de Diorito", + "block.mineralogy.diorite_smooth": "Bloco polido de Diorito", + "block.mineralogy.diorite_smooth_stairs": "Escadas polidas de Diorito", + "block.mineralogy.diorite_smooth_slab": "Laje polida de Diorito", + "block.mineralogy.diorite_smooth_brick": "Tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_stairs": "Escadas de tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_slab": "Laje de tijolos polidos de Diorito", + "block.mineralogy.granite": "Granito", + "block.mineralogy.granite_stairs": "Escadas de Granito", + "block.mineralogy.granite_slab": "Laje de Granito", + "block.mineralogy.granite_brick": "Tijolos de Granito", + "block.mineralogy.granite_brick_stairs": "Escadas de tijolos de Granito", + "block.mineralogy.granite_brick_slab": "Laje de tijolos de Granito", + "block.mineralogy.granite_smooth": "Bloco polido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escadas polidas de Granito", + "block.mineralogy.granite_smooth_slab": "Laje polida de Granito", + "block.mineralogy.granite_smooth_brick": "Tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escadas de tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Laje de tijolos polidos de Granito", + "block.mineralogy.rhyolite": "Riolito", + "block.mineralogy.rhyolite_stairs": "Escadas de Riolito", + "block.mineralogy.rhyolite_slab": "Laje de Riolito", + "block.mineralogy.rhyolite_brick": "Tijolos de Riolito", + "block.mineralogy.rhyolite_brick_stairs": "Escadas de tijolos de Riolito", + "block.mineralogy.rhyolite_brick_slab": "Laje de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth": "Bloco polido de Riolito", + "block.mineralogy.rhyolite_smooth_stairs": "Escadas polidas de Riolito", + "block.mineralogy.rhyolite_smooth_slab": "Laje polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick": "Tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escadas de tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_slab": "Laje de tijolos polidos de Riolito", + "block.mineralogy.pegmatite": "Pegmatito", + "block.mineralogy.pegmatite_stairs": "Escadas de Pegmatito", + "block.mineralogy.pegmatite_slab": "Laje de Pegmatito", + "block.mineralogy.pegmatite_brick": "Tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_stairs": "Escadas de tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_slab": "Laje de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth": "Bloco polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_stairs": "Escadas polidas de Pegmatito", + "block.mineralogy.pegmatite_smooth_slab": "Laje polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick": "Tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escadas de tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_slab": "Laje de tijolos polidos de Pegmatito", + "block.mineralogy.shale": "Folhelho", + "block.mineralogy.shale_stairs": "Escadas de Folhelho", + "block.mineralogy.shale_slab": "Laje de Folhelho", + "block.mineralogy.shale_brick": "Tijolos de Folhelho", + "block.mineralogy.shale_brick_stairs": "Escadas de tijolos de Folhelho", + "block.mineralogy.shale_brick_slab": "Laje de tijolos de Folhelho", + "block.mineralogy.shale_smooth": "Bloco polido de Folhelho", + "block.mineralogy.shale_smooth_stairs": "Escadas polidas de Folhelho", + "block.mineralogy.shale_smooth_slab": "Laje polida de Folhelho", + "block.mineralogy.shale_smooth_brick": "Tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_stairs": "Escadas de tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_slab": "Laje de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate": "Conglomerado", + "block.mineralogy.conglomerate_stairs": "Escadas de Conglomerado", + "block.mineralogy.conglomerate_slab": "Laje de Conglomerado", + "block.mineralogy.conglomerate_brick": "Tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escadas de tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Laje de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloco polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escadas polidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Laje polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escadas de tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Laje de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite": "Dolomita", + "block.mineralogy.dolomite_stairs": "Escadas de Dolomita", + "block.mineralogy.dolomite_slab": "Laje de Dolomita", + "block.mineralogy.dolomite_brick": "Tijolos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escadas de tijolos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Laje de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloco polido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escadas polidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Laje polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escadas de tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Laje de tijolos polidos de Dolomita", + "block.mineralogy.limestone": "Calcário", + "block.mineralogy.limestone_stairs": "Escadas de Calcário", + "block.mineralogy.limestone_slab": "Laje de Calcário", + "block.mineralogy.limestone_brick": "Tijolos de Calcário", + "block.mineralogy.limestone_brick_stairs": "Escadas de tijolos de Calcário", + "block.mineralogy.limestone_brick_slab": "Laje de tijolos de Calcário", + "block.mineralogy.limestone_smooth": "Bloco polido de Calcário", + "block.mineralogy.limestone_smooth_stairs": "Escadas polidas de Calcário", + "block.mineralogy.limestone_smooth_slab": "Laje polida de Calcário", + "block.mineralogy.limestone_smooth_brick": "Tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_stairs": "Escadas de tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_slab": "Laje de tijolos polidos de Calcário", + "block.mineralogy.slate": "Ardósia", + "block.mineralogy.slate_stairs": "Escadas de Ardósia", + "block.mineralogy.slate_slab": "Laje de Ardósia", + "block.mineralogy.slate_brick": "Tijolos de Ardósia", + "block.mineralogy.slate_brick_stairs": "Escadas de tijolos de Ardósia", + "block.mineralogy.slate_brick_slab": "Laje de tijolos de Ardósia", + "block.mineralogy.slate_smooth": "Bloco polido de Ardósia", + "block.mineralogy.slate_smooth_stairs": "Escadas polidas de Ardósia", + "block.mineralogy.slate_smooth_slab": "Laje polida de Ardósia", + "block.mineralogy.slate_smooth_brick": "Tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_stairs": "Escadas de tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_slab": "Laje de tijolos polidos de Ardósia", + "block.mineralogy.schist": "Xisto", + "block.mineralogy.schist_stairs": "Escadas de Xisto", + "block.mineralogy.schist_slab": "Laje de Xisto", + "block.mineralogy.schist_brick": "Tijolos de Xisto", + "block.mineralogy.schist_brick_stairs": "Escadas de tijolos de Xisto", + "block.mineralogy.schist_brick_slab": "Laje de tijolos de Xisto", + "block.mineralogy.schist_smooth": "Bloco polido de Xisto", + "block.mineralogy.schist_smooth_stairs": "Escadas polidas de Xisto", + "block.mineralogy.schist_smooth_slab": "Laje polida de Xisto", + "block.mineralogy.schist_smooth_brick": "Tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escadas de tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_slab": "Laje de tijolos polidos de Xisto", + "block.mineralogy.gneiss": "Gnaisse", + "block.mineralogy.gneiss_stairs": "Escadas de Gnaisse", + "block.mineralogy.gneiss_slab": "Laje de Gnaisse", + "block.mineralogy.gneiss_brick": "Tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_stairs": "Escadas de tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_slab": "Laje de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth": "Bloco polido de Gnaisse", + "block.mineralogy.gneiss_smooth_stairs": "Escadas polidas de Gnaisse", + "block.mineralogy.gneiss_smooth_slab": "Laje polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick": "Tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escadas de tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_slab": "Laje de tijolos polidos de Gnaisse", + "block.mineralogy.marble": "Mármore", + "block.mineralogy.marble_stairs": "Escadas de Mármore", + "block.mineralogy.marble_slab": "Laje de Mármore", + "block.mineralogy.marble_brick": "Tijolos de Mármore", + "block.mineralogy.marble_brick_stairs": "Escadas de tijolos de Mármore", + "block.mineralogy.marble_brick_slab": "Laje de tijolos de Mármore", + "block.mineralogy.marble_smooth": "Bloco polido de Mármore", + "block.mineralogy.marble_smooth_stairs": "Escadas polidas de Mármore", + "block.mineralogy.marble_smooth_slab": "Laje polida de Mármore", + "block.mineralogy.marble_smooth_brick": "Tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_stairs": "Escadas de tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_slab": "Laje de tijolos polidos de Mármore", + "block.mineralogy.phyllite": "Filito", + "block.mineralogy.phyllite_stairs": "Escadas de Filito", + "block.mineralogy.phyllite_slab": "Laje de Filito", + "block.mineralogy.phyllite_brick": "Tijolos de Filito", + "block.mineralogy.phyllite_brick_stairs": "Escadas de tijolos de Filito", + "block.mineralogy.phyllite_brick_slab": "Laje de tijolos de Filito", + "block.mineralogy.phyllite_smooth": "Bloco polido de Filito", + "block.mineralogy.phyllite_smooth_stairs": "Escadas polidas de Filito", + "block.mineralogy.phyllite_smooth_slab": "Laje polida de Filito", + "block.mineralogy.phyllite_smooth_brick": "Tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escadas de tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_slab": "Laje de tijolos polidos de Filito", + "block.mineralogy.amphibolite": "Anfibolito", + "block.mineralogy.amphibolite_stairs": "Escadas de Anfibolito", + "block.mineralogy.amphibolite_slab": "Laje de Anfibolito", + "block.mineralogy.amphibolite_brick": "Tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_stairs": "Escadas de tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_slab": "Laje de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth": "Bloco polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_stairs": "Escadas polidas de Anfibolito", + "block.mineralogy.amphibolite_smooth_slab": "Laje polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick": "Tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escadas de tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_slab": "Laje de tijolos polidos de Anfibolito", + "item.mineralogy.gypsum_dust": "Pó de gesso", + "item.mineralogy.sulfur_dust": "Pó de enxofre", + "item.mineralogy.phosphorous_dust": "Pó de fósforo", + "item.mineralogy.nitrate_dust": "Pó de nitrato", + "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", + "block.mineralogy.chert": "Sílex", + "block.mineralogy.gypsum": "Gesso", + "block.mineralogy.pumice": "Pedra-pomes", + "block.mineralogy.sulfur_block": "Enxofre", + "block.mineralogy.sulfur_ore": "Minério de enxofre", + "block.mineralogy.phosphorous_block": "Fósforo", + "block.mineralogy.phosphorous_ore": "Minério de fósforo", + "block.mineralogy.nitrate_block": "Nitrato", + "block.mineralogy.nitrate_ore": "Minério de nitrato", + "block.mineralogy.drywall_black": "Placa de gesso preta", + "block.mineralogy.drywall_red": "Placa de gesso vermelha", + "block.mineralogy.drywall_green": "Placa de gesso verde", + "block.mineralogy.drywall_brown": "Placa de gesso marrom", + "block.mineralogy.drywall_blue": "Placa de gesso azul", + "block.mineralogy.drywall_purple": "Placa de gesso roxa", + "block.mineralogy.drywall_cyan": "Placa de gesso ciana", + "block.mineralogy.drywall_silver": "Placa de gesso cinza-clara", + "block.mineralogy.drywall_gray": "Placa de gesso cinza", + "block.mineralogy.drywall_pink": "Placa de gesso rosa", + "block.mineralogy.drywall_lime": "Placa de gesso verde-limão", + "block.mineralogy.drywall_yellow": "Placa de gesso amarela", + "block.mineralogy.drywall_light_blue": "Placa de gesso azul-clara", + "block.mineralogy.drywall_magenta": "Placa de gesso magenta", + "block.mineralogy.drywall_orange": "Placa de gesso laranja", + "block.mineralogy.drywall_white": "Placa de gesso branca", + "block.mineralogy.andesite_wall": "Muro de Andesito", + "block.mineralogy.andesite_brick_wall": "Muro de tijolos de Andesito", + "block.mineralogy.andesite_smooth_wall": "Muro polido de Andesito", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de tijolos polidos de Andesito", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de tijolos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro polido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de tijolos polidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorito", + "block.mineralogy.diorite_brick_wall": "Muro de tijolos de Diorito", + "block.mineralogy.diorite_smooth_wall": "Muro polido de Diorito", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de tijolos polidos de Diorito", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de tijolos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro polido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de tijolos polidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolito", + "block.mineralogy.rhyolite_brick_wall": "Muro de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_wall": "Muro polido de Riolito", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatito", + "block.mineralogy.pegmatite_brick_wall": "Muro de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_wall": "Muro polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de tijolos polidos de Pegmatito", + "block.mineralogy.shale_wall": "Muro de Folhelho", + "block.mineralogy.shale_brick_wall": "Muro de tijolos de Folhelho", + "block.mineralogy.shale_smooth_wall": "Muro polido de Folhelho", + "block.mineralogy.shale_smooth_brick_wall": "Muro de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_wall": "Muro de Dolomita", + "block.mineralogy.dolomite_brick_wall": "Muro de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro polido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de tijolos polidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Calcário", + "block.mineralogy.limestone_brick_wall": "Muro de tijolos de Calcário", + "block.mineralogy.limestone_smooth_wall": "Muro polido de Calcário", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de tijolos polidos de Calcário", + "block.mineralogy.marble_wall": "Muro de Mármore", + "block.mineralogy.marble_brick_wall": "Muro de tijolos de Mármore", + "block.mineralogy.marble_smooth_wall": "Muro polido de Mármore", + "block.mineralogy.marble_smooth_brick_wall": "Muro de tijolos polidos de Mármore", + "block.mineralogy.slate_wall": "Muro de Ardósia", + "block.mineralogy.slate_brick_wall": "Muro de tijolos de Ardósia", + "block.mineralogy.slate_smooth_wall": "Muro polido de Ardósia", + "block.mineralogy.slate_smooth_brick_wall": "Muro de tijolos polidos de Ardósia", + "block.mineralogy.schist_wall": "Muro de Xisto", + "block.mineralogy.schist_brick_wall": "Muro de tijolos de Xisto", + "block.mineralogy.schist_smooth_wall": "Muro polido de Xisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de tijolos polidos de Xisto", + "block.mineralogy.gneiss_wall": "Muro de Gnaisse", + "block.mineralogy.gneiss_brick_wall": "Muro de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_wall": "Muro polido de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_wall": "Muro de Filito", + "block.mineralogy.phyllite_brick_wall": "Muro de tijolos de Filito", + "block.mineralogy.phyllite_smooth_wall": "Muro polido de Filito", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de tijolos polidos de Filito", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolito", + "block.mineralogy.amphibolite_brick_wall": "Muro de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_wall": "Muro polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de tijolos polidos de Anfibolito", + "block.mineralogy.andesite_furnace": "Fornalha de Andesito", + "block.mineralogy.andesite_brick_furnace": "Fornalha de tijolos de Andesito", + "block.mineralogy.andesite_smooth_furnace": "Fornalha polida de Andesito", + "block.mineralogy.andesite_smooth_brick_furnace": "Fornalha de tijolos polidos de Andesito", + "block.mineralogy.basalt_furnace": "Fornalha de Basalto", + "block.mineralogy.basalt_brick_furnace": "Fornalha de tijolos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Fornalha polida de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Fornalha de tijolos polidos de Basalto", + "block.mineralogy.diorite_furnace": "Fornalha de Diorito", + "block.mineralogy.diorite_brick_furnace": "Fornalha de tijolos de Diorito", + "block.mineralogy.diorite_smooth_furnace": "Fornalha polida de Diorito", + "block.mineralogy.diorite_smooth_brick_furnace": "Fornalha de tijolos polidos de Diorito", + "block.mineralogy.granite_furnace": "Fornalha de Granito", + "block.mineralogy.granite_brick_furnace": "Fornalha de tijolos de Granito", + "block.mineralogy.granite_smooth_furnace": "Fornalha polida de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Fornalha de tijolos polidos de Granito", + "block.mineralogy.rhyolite_furnace": "Fornalha de Riolito", + "block.mineralogy.rhyolite_brick_furnace": "Fornalha de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_furnace": "Fornalha polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_furnace": "Fornalha de Pegmatito", + "block.mineralogy.pegmatite_brick_furnace": "Fornalha de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_furnace": "Fornalha polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fornalha de tijolos polidos de Pegmatito", + "block.mineralogy.shale_furnace": "Fornalha de Folhelho", + "block.mineralogy.shale_brick_furnace": "Fornalha de tijolos de Folhelho", + "block.mineralogy.shale_smooth_furnace": "Fornalha polida de Folhelho", + "block.mineralogy.shale_smooth_brick_furnace": "Fornalha de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_furnace": "Fornalha de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Fornalha de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Fornalha polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fornalha de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Fornalha de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Fornalha de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Fornalha polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fornalha de tijolos polidos de Dolomita", + "block.mineralogy.limestone_furnace": "Fornalha de Calcário", + "block.mineralogy.limestone_brick_furnace": "Fornalha de tijolos de Calcário", + "block.mineralogy.limestone_smooth_furnace": "Fornalha polida de Calcário", + "block.mineralogy.limestone_smooth_brick_furnace": "Fornalha de tijolos polidos de Calcário", + "block.mineralogy.marble_furnace": "Fornalha de Mármore", + "block.mineralogy.marble_brick_furnace": "Fornalha de tijolos de Mármore", + "block.mineralogy.marble_smooth_furnace": "Fornalha polida de Mármore", + "block.mineralogy.marble_smooth_brick_furnace": "Fornalha de tijolos polidos de Mármore", + "block.mineralogy.slate_furnace": "Fornalha de Ardósia", + "block.mineralogy.slate_brick_furnace": "Fornalha de tijolos de Ardósia", + "block.mineralogy.slate_smooth_furnace": "Fornalha polida de Ardósia", + "block.mineralogy.slate_smooth_brick_furnace": "Fornalha de tijolos polidos de Ardósia", + "block.mineralogy.schist_furnace": "Fornalha de Xisto", + "block.mineralogy.schist_brick_furnace": "Fornalha de tijolos de Xisto", + "block.mineralogy.schist_smooth_furnace": "Fornalha polida de Xisto", + "block.mineralogy.schist_smooth_brick_furnace": "Fornalha de tijolos polidos de Xisto", + "block.mineralogy.gneiss_furnace": "Fornalha de Gnaisse", + "block.mineralogy.gneiss_brick_furnace": "Fornalha de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_furnace": "Fornalha polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fornalha de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_furnace": "Fornalha de Filito", + "block.mineralogy.phyllite_brick_furnace": "Fornalha de tijolos de Filito", + "block.mineralogy.phyllite_smooth_furnace": "Fornalha polida de Filito", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fornalha de tijolos polidos de Filito", + "block.mineralogy.amphibolite_furnace": "Fornalha de Anfibolito", + "block.mineralogy.amphibolite_brick_furnace": "Fornalha de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_furnace": "Fornalha polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Anfibolito", + "block.mineralogy.diabase": "Diabásio", + "block.mineralogy.diabase_stairs": "Escadas de Diabásio", + "block.mineralogy.diabase_slab": "Laje de Diabásio", + "block.mineralogy.diabase_brick": "Tijolos de Diabásio", + "block.mineralogy.diabase_brick_stairs": "Escadas de tijolos de Diabásio", + "block.mineralogy.diabase_brick_slab": "Laje de tijolos de Diabásio", + "block.mineralogy.diabase_smooth": "Bloco polido de Diabásio", + "block.mineralogy.diabase_smooth_stairs": "Escadas polidas de Diabásio", + "block.mineralogy.diabase_smooth_slab": "Laje polida de Diabásio", + "block.mineralogy.diabase_smooth_brick": "Tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_stairs": "Escadas de tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_slab": "Laje de tijolos polidos de Diabásio", + "block.mineralogy.diabase_wall": "Muro de Diabásio", + "block.mineralogy.diabase_brick_wall": "Muro de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_wall": "Muro polido de Diabásio", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de tijolos polidos de Diabásio", + "block.mineralogy.diabase_furnace": "Fornalha de Diabásio", + "block.mineralogy.diabase_brick_furnace": "Fornalha de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_furnace": "Fornalha polida de Diabásio", + "block.mineralogy.diabase_smooth_brick_furnace": "Fornalha de tijolos polidos de Diabásio", + "block.mineralogy.gabbro": "Gabro", + "block.mineralogy.gabbro_stairs": "Escadas de Gabro", + "block.mineralogy.gabbro_slab": "Laje de Gabro", + "block.mineralogy.gabbro_brick": "Tijolos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escadas de tijolos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Laje de tijolos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloco polido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escadas polidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Laje polida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escadas de tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Laje de tijolos polidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro polido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de tijolos polidos de Gabro", + "block.mineralogy.gabbro_furnace": "Fornalha de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Fornalha de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Fornalha polida de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fornalha de tijolos polidos de Gabro", + "block.mineralogy.peridotite": "Peridotito", + "block.mineralogy.peridotite_stairs": "Escadas de Peridotito", + "block.mineralogy.peridotite_slab": "Laje de Peridotito", + "block.mineralogy.peridotite_brick": "Tijolos de Peridotito", + "block.mineralogy.peridotite_brick_stairs": "Escadas de tijolos de Peridotito", + "block.mineralogy.peridotite_brick_slab": "Laje de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth": "Bloco polido de Peridotito", + "block.mineralogy.peridotite_smooth_stairs": "Escadas polidas de Peridotito", + "block.mineralogy.peridotite_smooth_slab": "Laje polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick": "Tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escadas de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_slab": "Laje de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_wall": "Muro de Peridotito", + "block.mineralogy.peridotite_brick_wall": "Muro de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_wall": "Muro polido de Peridotito", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_furnace": "Fornalha de Peridotito", + "block.mineralogy.peridotite_brick_furnace": "Fornalha de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_furnace": "Fornalha polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fornalha de tijolos polidos de Peridotito", + "block.mineralogy.basaltic_glass": "Vidro basáltico", + "block.mineralogy.basaltic_glass_stairs": "Escadas de Vidro basáltico", + "block.mineralogy.basaltic_glass_slab": "Laje de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick": "Tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escadas de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Laje de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloco polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escadas polidas de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Laje polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escadas de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Laje de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_furnace": "Fornalha de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Fornalha de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fornalha polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fornalha de tijolos polidos de Vidro basáltico", + "block.mineralogy.scoria": "Escória", + "block.mineralogy.scoria_stairs": "Escadas de Escória", + "block.mineralogy.scoria_slab": "Laje de Escória", + "block.mineralogy.scoria_brick": "Tijolos de Escória", + "block.mineralogy.scoria_brick_stairs": "Escadas de tijolos de Escória", + "block.mineralogy.scoria_brick_slab": "Laje de tijolos de Escória", + "block.mineralogy.scoria_smooth": "Bloco polido de Escória", + "block.mineralogy.scoria_smooth_stairs": "Escadas polidas de Escória", + "block.mineralogy.scoria_smooth_slab": "Laje polida de Escória", + "block.mineralogy.scoria_smooth_brick": "Tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_stairs": "Escadas de tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_slab": "Laje de tijolos polidos de Escória", + "block.mineralogy.scoria_wall": "Muro de Escória", + "block.mineralogy.scoria_brick_wall": "Muro de tijolos de Escória", + "block.mineralogy.scoria_smooth_wall": "Muro polido de Escória", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de tijolos polidos de Escória", + "block.mineralogy.scoria_furnace": "Fornalha de Escória", + "block.mineralogy.scoria_brick_furnace": "Fornalha de tijolos de Escória", + "block.mineralogy.scoria_smooth_furnace": "Fornalha polida de Escória", + "block.mineralogy.scoria_smooth_brick_furnace": "Fornalha de tijolos polidos de Escória", + "block.mineralogy.tuff": "Tufo", + "block.mineralogy.tuff_stairs": "Escadas de Tufo", + "block.mineralogy.tuff_slab": "Laje de Tufo", + "block.mineralogy.tuff_brick": "Tijolos de Tufo", + "block.mineralogy.tuff_brick_stairs": "Escadas de tijolos de Tufo", + "block.mineralogy.tuff_brick_slab": "Laje de tijolos de Tufo", + "block.mineralogy.tuff_smooth": "Bloco polido de Tufo", + "block.mineralogy.tuff_smooth_stairs": "Escadas polidas de Tufo", + "block.mineralogy.tuff_smooth_slab": "Laje polida de Tufo", + "block.mineralogy.tuff_smooth_brick": "Tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_stairs": "Escadas de tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_slab": "Laje de tijolos polidos de Tufo", + "block.mineralogy.tuff_wall": "Muro de Tufo", + "block.mineralogy.tuff_brick_wall": "Muro de tijolos de Tufo", + "block.mineralogy.tuff_smooth_wall": "Muro polido de Tufo", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de tijolos polidos de Tufo", + "block.mineralogy.tuff_furnace": "Fornalha de Tufo", + "block.mineralogy.tuff_brick_furnace": "Fornalha de tijolos de Tufo", + "block.mineralogy.tuff_smooth_furnace": "Fornalha polida de Tufo", + "block.mineralogy.tuff_smooth_brick_furnace": "Fornalha de tijolos polidos de Tufo", + "block.mineralogy.siltstone": "Siltito", + "block.mineralogy.siltstone_stairs": "Escadas de Siltito", + "block.mineralogy.siltstone_slab": "Laje de Siltito", + "block.mineralogy.siltstone_brick": "Tijolos de Siltito", + "block.mineralogy.siltstone_brick_stairs": "Escadas de tijolos de Siltito", + "block.mineralogy.siltstone_brick_slab": "Laje de tijolos de Siltito", + "block.mineralogy.siltstone_smooth": "Bloco polido de Siltito", + "block.mineralogy.siltstone_smooth_stairs": "Escadas polidas de Siltito", + "block.mineralogy.siltstone_smooth_slab": "Laje polida de Siltito", + "block.mineralogy.siltstone_smooth_brick": "Tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escadas de tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_slab": "Laje de tijolos polidos de Siltito", + "block.mineralogy.siltstone_wall": "Muro de Siltito", + "block.mineralogy.siltstone_brick_wall": "Muro de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_wall": "Muro polido de Siltito", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de tijolos polidos de Siltito", + "block.mineralogy.siltstone_furnace": "Fornalha de Siltito", + "block.mineralogy.siltstone_brick_furnace": "Fornalha de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_furnace": "Fornalha polida de Siltito", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fornalha de tijolos polidos de Siltito", + "block.mineralogy.rock_salt": "Sal-gema", + "block.mineralogy.rock_salt_stairs": "Escadas de Sal-gema", + "block.mineralogy.rock_salt_slab": "Laje de Sal-gema", + "block.mineralogy.rock_salt_brick": "Tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_stairs": "Escadas de tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_slab": "Laje de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth": "Bloco polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_stairs": "Escadas polidas de Sal-gema", + "block.mineralogy.rock_salt_smooth_slab": "Laje polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick": "Tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escadas de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_slab": "Laje de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_wall": "Muro de Sal-gema", + "block.mineralogy.rock_salt_brick_wall": "Muro de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_wall": "Muro polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_furnace": "Fornalha de Sal-gema", + "block.mineralogy.rock_salt_brick_furnace": "Fornalha de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_furnace": "Fornalha polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fornalha de tijolos polidos de Sal-gema", + "block.mineralogy.hornfels": "Cornubianito", + "block.mineralogy.hornfels_stairs": "Escadas de Cornubianito", + "block.mineralogy.hornfels_slab": "Laje de Cornubianito", + "block.mineralogy.hornfels_brick": "Tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_stairs": "Escadas de tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_slab": "Laje de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth": "Bloco polido de Cornubianito", + "block.mineralogy.hornfels_smooth_stairs": "Escadas polidas de Cornubianito", + "block.mineralogy.hornfels_smooth_slab": "Laje polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick": "Tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escadas de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_slab": "Laje de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_wall": "Muro de Cornubianito", + "block.mineralogy.hornfels_brick_wall": "Muro de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_wall": "Muro polido de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_furnace": "Fornalha de Cornubianito", + "block.mineralogy.hornfels_brick_furnace": "Fornalha de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_furnace": "Fornalha polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fornalha de tijolos polidos de Cornubianito", + "block.mineralogy.quartzite": "Quartzito", + "block.mineralogy.quartzite_stairs": "Escadas de Quartzito", + "block.mineralogy.quartzite_slab": "Laje de Quartzito", + "block.mineralogy.quartzite_brick": "Tijolos de Quartzito", + "block.mineralogy.quartzite_brick_stairs": "Escadas de tijolos de Quartzito", + "block.mineralogy.quartzite_brick_slab": "Laje de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth": "Bloco polido de Quartzito", + "block.mineralogy.quartzite_smooth_stairs": "Escadas polidas de Quartzito", + "block.mineralogy.quartzite_smooth_slab": "Laje polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick": "Tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escadas de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_slab": "Laje de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_wall": "Muro de Quartzito", + "block.mineralogy.quartzite_brick_wall": "Muro de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_wall": "Muro polido de Quartzito", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_furnace": "Fornalha de Quartzito", + "block.mineralogy.quartzite_brick_furnace": "Fornalha de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_furnace": "Fornalha polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fornalha de tijolos polidos de Quartzito", + "block.mineralogy.novaculite": "Novaculita", + "block.mineralogy.novaculite_stairs": "Escadas de Novaculita", + "block.mineralogy.novaculite_slab": "Laje de Novaculita", + "block.mineralogy.novaculite_brick": "Tijolos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escadas de tijolos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Laje de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloco polido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escadas polidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Laje polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escadas de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Laje de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro polido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Fornalha de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Fornalha de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Fornalha polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fornalha de tijolos polidos de Novaculita", + "block.mineralogy.chalk": "Giz", + "item.mineralogy.chalk_dust": "Pó de giz", + "item.mineralogy.salt_dust": "Sal", + "item.mineralogy.rock_salt_dust": "Cristais de sal-gema", + "block.mineralogy.rocksaltlamp": "Luminária de sal-gema", + "block.mineralogy.rocksaltstreetlamp": "Poste de luz de sal-gema", + "block.mineralogy.andesite_relief_axe": "Baixo-relevo de Andesito (machado)", + "block.mineralogy.andesite_relief_blank": "Baixo-relevo de Andesito (sem motivo)", + "block.mineralogy.andesite_relief_cross": "Baixo-relevo de Andesito (cruz)", + "block.mineralogy.andesite_relief_hammer": "Baixo-relevo de Andesito (martelo)", + "block.mineralogy.andesite_relief_hoe": "Baixo-relevo de Andesito (enxada)", + "block.mineralogy.andesite_relief_horizontal": "Baixo-relevo de Andesito (horizontal)", + "block.mineralogy.andesite_relief_i": "Baixo-relevo de Andesito (I)", + "block.mineralogy.andesite_relief_left": "Baixo-relevo de Andesito (esquerda)", + "block.mineralogy.andesite_relief_pickaxe": "Baixo-relevo de Andesito (picareta)", + "block.mineralogy.andesite_relief_plus": "Baixo-relevo de Andesito (sinal de mais)", + "block.mineralogy.andesite_relief_right": "Baixo-relevo de Andesito (direita)", + "block.mineralogy.andesite_relief_sword": "Baixo-relevo de Andesito (espada)", + "block.mineralogy.andesite_relief_vertical": "Baixo-relevo de Andesito (vertical)", + "block.mineralogy.basalt_relief_axe": "Baixo-relevo de Basalto (machado)", + "block.mineralogy.basalt_relief_blank": "Baixo-relevo de Basalto (sem motivo)", + "block.mineralogy.basalt_relief_cross": "Baixo-relevo de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Baixo-relevo de Basalto (martelo)", + "block.mineralogy.basalt_relief_hoe": "Baixo-relevo de Basalto (enxada)", + "block.mineralogy.basalt_relief_horizontal": "Baixo-relevo de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Baixo-relevo de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Baixo-relevo de Basalto (esquerda)", + "block.mineralogy.basalt_relief_pickaxe": "Baixo-relevo de Basalto (picareta)", + "block.mineralogy.basalt_relief_plus": "Baixo-relevo de Basalto (sinal de mais)", + "block.mineralogy.basalt_relief_right": "Baixo-relevo de Basalto (direita)", + "block.mineralogy.basalt_relief_sword": "Baixo-relevo de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Baixo-relevo de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Baixo-relevo de Diorito (machado)", + "block.mineralogy.diorite_relief_blank": "Baixo-relevo de Diorito (sem motivo)", + "block.mineralogy.diorite_relief_cross": "Baixo-relevo de Diorito (cruz)", + "block.mineralogy.diorite_relief_hammer": "Baixo-relevo de Diorito (martelo)", + "block.mineralogy.diorite_relief_hoe": "Baixo-relevo de Diorito (enxada)", + "block.mineralogy.diorite_relief_horizontal": "Baixo-relevo de Diorito (horizontal)", + "block.mineralogy.diorite_relief_i": "Baixo-relevo de Diorito (I)", + "block.mineralogy.diorite_relief_left": "Baixo-relevo de Diorito (esquerda)", + "block.mineralogy.diorite_relief_pickaxe": "Baixo-relevo de Diorito (picareta)", + "block.mineralogy.diorite_relief_plus": "Baixo-relevo de Diorito (sinal de mais)", + "block.mineralogy.diorite_relief_right": "Baixo-relevo de Diorito (direita)", + "block.mineralogy.diorite_relief_sword": "Baixo-relevo de Diorito (espada)", + "block.mineralogy.diorite_relief_vertical": "Baixo-relevo de Diorito (vertical)", + "block.mineralogy.granite_relief_axe": "Baixo-relevo de Granito (machado)", + "block.mineralogy.granite_relief_blank": "Baixo-relevo de Granito (sem motivo)", + "block.mineralogy.granite_relief_cross": "Baixo-relevo de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Baixo-relevo de Granito (martelo)", + "block.mineralogy.granite_relief_hoe": "Baixo-relevo de Granito (enxada)", + "block.mineralogy.granite_relief_horizontal": "Baixo-relevo de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Baixo-relevo de Granito (I)", + "block.mineralogy.granite_relief_left": "Baixo-relevo de Granito (esquerda)", + "block.mineralogy.granite_relief_pickaxe": "Baixo-relevo de Granito (picareta)", + "block.mineralogy.granite_relief_plus": "Baixo-relevo de Granito (sinal de mais)", + "block.mineralogy.granite_relief_right": "Baixo-relevo de Granito (direita)", + "block.mineralogy.granite_relief_sword": "Baixo-relevo de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Baixo-relevo de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Baixo-relevo de Riolito (machado)", + "block.mineralogy.rhyolite_relief_blank": "Baixo-relevo de Riolito (sem motivo)", + "block.mineralogy.rhyolite_relief_cross": "Baixo-relevo de Riolito (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Baixo-relevo de Riolito (martelo)", + "block.mineralogy.rhyolite_relief_hoe": "Baixo-relevo de Riolito (enxada)", + "block.mineralogy.rhyolite_relief_horizontal": "Baixo-relevo de Riolito (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Baixo-relevo de Riolito (I)", + "block.mineralogy.rhyolite_relief_left": "Baixo-relevo de Riolito (esquerda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Baixo-relevo de Riolito (picareta)", + "block.mineralogy.rhyolite_relief_plus": "Baixo-relevo de Riolito (sinal de mais)", + "block.mineralogy.rhyolite_relief_right": "Baixo-relevo de Riolito (direita)", + "block.mineralogy.rhyolite_relief_sword": "Baixo-relevo de Riolito (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Baixo-relevo de Riolito (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Baixo-relevo de Pegmatito (machado)", + "block.mineralogy.pegmatite_relief_blank": "Baixo-relevo de Pegmatito (sem motivo)", + "block.mineralogy.pegmatite_relief_cross": "Baixo-relevo de Pegmatito (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Baixo-relevo de Pegmatito (martelo)", + "block.mineralogy.pegmatite_relief_hoe": "Baixo-relevo de Pegmatito (enxada)", + "block.mineralogy.pegmatite_relief_horizontal": "Baixo-relevo de Pegmatito (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Baixo-relevo de Pegmatito (I)", + "block.mineralogy.pegmatite_relief_left": "Baixo-relevo de Pegmatito (esquerda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Baixo-relevo de Pegmatito (picareta)", + "block.mineralogy.pegmatite_relief_plus": "Baixo-relevo de Pegmatito (sinal de mais)", + "block.mineralogy.pegmatite_relief_right": "Baixo-relevo de Pegmatito (direita)", + "block.mineralogy.pegmatite_relief_sword": "Baixo-relevo de Pegmatito (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Baixo-relevo de Pegmatito (vertical)", + "block.mineralogy.shale_relief_axe": "Baixo-relevo de Folhelho (machado)", + "block.mineralogy.shale_relief_blank": "Baixo-relevo de Folhelho (sem motivo)", + "block.mineralogy.shale_relief_cross": "Baixo-relevo de Folhelho (cruz)", + "block.mineralogy.shale_relief_hammer": "Baixo-relevo de Folhelho (martelo)", + "block.mineralogy.shale_relief_hoe": "Baixo-relevo de Folhelho (enxada)", + "block.mineralogy.shale_relief_horizontal": "Baixo-relevo de Folhelho (horizontal)", + "block.mineralogy.shale_relief_i": "Baixo-relevo de Folhelho (I)", + "block.mineralogy.shale_relief_left": "Baixo-relevo de Folhelho (esquerda)", + "block.mineralogy.shale_relief_pickaxe": "Baixo-relevo de Folhelho (picareta)", + "block.mineralogy.shale_relief_plus": "Baixo-relevo de Folhelho (sinal de mais)", + "block.mineralogy.shale_relief_right": "Baixo-relevo de Folhelho (direita)", + "block.mineralogy.shale_relief_sword": "Baixo-relevo de Folhelho (espada)", + "block.mineralogy.shale_relief_vertical": "Baixo-relevo de Folhelho (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Baixo-relevo de Conglomerado (machado)", + "block.mineralogy.conglomerate_relief_blank": "Baixo-relevo de Conglomerado (sem motivo)", + "block.mineralogy.conglomerate_relief_cross": "Baixo-relevo de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Baixo-relevo de Conglomerado (martelo)", + "block.mineralogy.conglomerate_relief_hoe": "Baixo-relevo de Conglomerado (enxada)", + "block.mineralogy.conglomerate_relief_horizontal": "Baixo-relevo de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Baixo-relevo de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Baixo-relevo de Conglomerado (esquerda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Baixo-relevo de Conglomerado (picareta)", + "block.mineralogy.conglomerate_relief_plus": "Baixo-relevo de Conglomerado (sinal de mais)", + "block.mineralogy.conglomerate_relief_right": "Baixo-relevo de Conglomerado (direita)", + "block.mineralogy.conglomerate_relief_sword": "Baixo-relevo de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Baixo-relevo de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Baixo-relevo de Dolomita (machado)", + "block.mineralogy.dolomite_relief_blank": "Baixo-relevo de Dolomita (sem motivo)", + "block.mineralogy.dolomite_relief_cross": "Baixo-relevo de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Baixo-relevo de Dolomita (martelo)", + "block.mineralogy.dolomite_relief_hoe": "Baixo-relevo de Dolomita (enxada)", + "block.mineralogy.dolomite_relief_horizontal": "Baixo-relevo de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Baixo-relevo de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Baixo-relevo de Dolomita (esquerda)", + "block.mineralogy.dolomite_relief_pickaxe": "Baixo-relevo de Dolomita (picareta)", + "block.mineralogy.dolomite_relief_plus": "Baixo-relevo de Dolomita (sinal de mais)", + "block.mineralogy.dolomite_relief_right": "Baixo-relevo de Dolomita (direita)", + "block.mineralogy.dolomite_relief_sword": "Baixo-relevo de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Baixo-relevo de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Baixo-relevo de Calcário (machado)", + "block.mineralogy.limestone_relief_blank": "Baixo-relevo de Calcário (sem motivo)", + "block.mineralogy.limestone_relief_cross": "Baixo-relevo de Calcário (cruz)", + "block.mineralogy.limestone_relief_hammer": "Baixo-relevo de Calcário (martelo)", + "block.mineralogy.limestone_relief_hoe": "Baixo-relevo de Calcário (enxada)", + "block.mineralogy.limestone_relief_horizontal": "Baixo-relevo de Calcário (horizontal)", + "block.mineralogy.limestone_relief_i": "Baixo-relevo de Calcário (I)", + "block.mineralogy.limestone_relief_left": "Baixo-relevo de Calcário (esquerda)", + "block.mineralogy.limestone_relief_pickaxe": "Baixo-relevo de Calcário (picareta)", + "block.mineralogy.limestone_relief_plus": "Baixo-relevo de Calcário (sinal de mais)", + "block.mineralogy.limestone_relief_right": "Baixo-relevo de Calcário (direita)", + "block.mineralogy.limestone_relief_sword": "Baixo-relevo de Calcário (espada)", + "block.mineralogy.limestone_relief_vertical": "Baixo-relevo de Calcário (vertical)", + "block.mineralogy.marble_relief_axe": "Baixo-relevo de Mármore (machado)", + "block.mineralogy.marble_relief_blank": "Baixo-relevo de Mármore (sem motivo)", + "block.mineralogy.marble_relief_cross": "Baixo-relevo de Mármore (cruz)", + "block.mineralogy.marble_relief_hammer": "Baixo-relevo de Mármore (martelo)", + "block.mineralogy.marble_relief_hoe": "Baixo-relevo de Mármore (enxada)", + "block.mineralogy.marble_relief_horizontal": "Baixo-relevo de Mármore (horizontal)", + "block.mineralogy.marble_relief_i": "Baixo-relevo de Mármore (I)", + "block.mineralogy.marble_relief_left": "Baixo-relevo de Mármore (esquerda)", + "block.mineralogy.marble_relief_pickaxe": "Baixo-relevo de Mármore (picareta)", + "block.mineralogy.marble_relief_plus": "Baixo-relevo de Mármore (sinal de mais)", + "block.mineralogy.marble_relief_right": "Baixo-relevo de Mármore (direita)", + "block.mineralogy.marble_relief_sword": "Baixo-relevo de Mármore (espada)", + "block.mineralogy.marble_relief_vertical": "Baixo-relevo de Mármore (vertical)", + "block.mineralogy.slate_relief_axe": "Baixo-relevo de Ardósia (machado)", + "block.mineralogy.slate_relief_blank": "Baixo-relevo de Ardósia (sem motivo)", + "block.mineralogy.slate_relief_cross": "Baixo-relevo de Ardósia (cruz)", + "block.mineralogy.slate_relief_hammer": "Baixo-relevo de Ardósia (martelo)", + "block.mineralogy.slate_relief_hoe": "Baixo-relevo de Ardósia (enxada)", + "block.mineralogy.slate_relief_horizontal": "Baixo-relevo de Ardósia (horizontal)", + "block.mineralogy.slate_relief_i": "Baixo-relevo de Ardósia (I)", + "block.mineralogy.slate_relief_left": "Baixo-relevo de Ardósia (esquerda)", + "block.mineralogy.slate_relief_pickaxe": "Baixo-relevo de Ardósia (picareta)", + "block.mineralogy.slate_relief_plus": "Baixo-relevo de Ardósia (sinal de mais)", + "block.mineralogy.slate_relief_right": "Baixo-relevo de Ardósia (direita)", + "block.mineralogy.slate_relief_sword": "Baixo-relevo de Ardósia (espada)", + "block.mineralogy.slate_relief_vertical": "Baixo-relevo de Ardósia (vertical)", + "block.mineralogy.schist_relief_axe": "Baixo-relevo de Xisto (machado)", + "block.mineralogy.schist_relief_blank": "Baixo-relevo de Xisto (sem motivo)", + "block.mineralogy.schist_relief_cross": "Baixo-relevo de Xisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Baixo-relevo de Xisto (martelo)", + "block.mineralogy.schist_relief_hoe": "Baixo-relevo de Xisto (enxada)", + "block.mineralogy.schist_relief_horizontal": "Baixo-relevo de Xisto (horizontal)", + "block.mineralogy.schist_relief_i": "Baixo-relevo de Xisto (I)", + "block.mineralogy.schist_relief_left": "Baixo-relevo de Xisto (esquerda)", + "block.mineralogy.schist_relief_pickaxe": "Baixo-relevo de Xisto (picareta)", + "block.mineralogy.schist_relief_plus": "Baixo-relevo de Xisto (sinal de mais)", + "block.mineralogy.schist_relief_right": "Baixo-relevo de Xisto (direita)", + "block.mineralogy.schist_relief_sword": "Baixo-relevo de Xisto (espada)", + "block.mineralogy.schist_relief_vertical": "Baixo-relevo de Xisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Baixo-relevo de Gnaisse (machado)", + "block.mineralogy.gneiss_relief_blank": "Baixo-relevo de Gnaisse (sem motivo)", + "block.mineralogy.gneiss_relief_cross": "Baixo-relevo de Gnaisse (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Baixo-relevo de Gnaisse (martelo)", + "block.mineralogy.gneiss_relief_hoe": "Baixo-relevo de Gnaisse (enxada)", + "block.mineralogy.gneiss_relief_horizontal": "Baixo-relevo de Gnaisse (horizontal)", + "block.mineralogy.gneiss_relief_i": "Baixo-relevo de Gnaisse (I)", + "block.mineralogy.gneiss_relief_left": "Baixo-relevo de Gnaisse (esquerda)", + "block.mineralogy.gneiss_relief_pickaxe": "Baixo-relevo de Gnaisse (picareta)", + "block.mineralogy.gneiss_relief_plus": "Baixo-relevo de Gnaisse (sinal de mais)", + "block.mineralogy.gneiss_relief_right": "Baixo-relevo de Gnaisse (direita)", + "block.mineralogy.gneiss_relief_sword": "Baixo-relevo de Gnaisse (espada)", + "block.mineralogy.gneiss_relief_vertical": "Baixo-relevo de Gnaisse (vertical)", + "block.mineralogy.phyllite_relief_axe": "Baixo-relevo de Filito (machado)", + "block.mineralogy.phyllite_relief_blank": "Baixo-relevo de Filito (sem motivo)", + "block.mineralogy.phyllite_relief_cross": "Baixo-relevo de Filito (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Baixo-relevo de Filito (martelo)", + "block.mineralogy.phyllite_relief_hoe": "Baixo-relevo de Filito (enxada)", + "block.mineralogy.phyllite_relief_horizontal": "Baixo-relevo de Filito (horizontal)", + "block.mineralogy.phyllite_relief_i": "Baixo-relevo de Filito (I)", + "block.mineralogy.phyllite_relief_left": "Baixo-relevo de Filito (esquerda)", + "block.mineralogy.phyllite_relief_pickaxe": "Baixo-relevo de Filito (picareta)", + "block.mineralogy.phyllite_relief_plus": "Baixo-relevo de Filito (sinal de mais)", + "block.mineralogy.phyllite_relief_right": "Baixo-relevo de Filito (direita)", + "block.mineralogy.phyllite_relief_sword": "Baixo-relevo de Filito (espada)", + "block.mineralogy.phyllite_relief_vertical": "Baixo-relevo de Filito (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Baixo-relevo de Anfibolito (machado)", + "block.mineralogy.amphibolite_relief_blank": "Baixo-relevo de Anfibolito (sem motivo)", + "block.mineralogy.amphibolite_relief_cross": "Baixo-relevo de Anfibolito (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Baixo-relevo de Anfibolito (martelo)", + "block.mineralogy.amphibolite_relief_hoe": "Baixo-relevo de Anfibolito (enxada)", + "block.mineralogy.amphibolite_relief_horizontal": "Baixo-relevo de Anfibolito (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Baixo-relevo de Anfibolito (I)", + "block.mineralogy.amphibolite_relief_left": "Baixo-relevo de Anfibolito (esquerda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Baixo-relevo de Anfibolito (picareta)", + "block.mineralogy.amphibolite_relief_plus": "Baixo-relevo de Anfibolito (sinal de mais)", + "block.mineralogy.amphibolite_relief_right": "Baixo-relevo de Anfibolito (direita)", + "block.mineralogy.amphibolite_relief_sword": "Baixo-relevo de Anfibolito (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Baixo-relevo de Anfibolito (vertical)", + "block.mineralogy.diabase_relief_axe": "Baixo-relevo de Diabásio (machado)", + "block.mineralogy.diabase_relief_blank": "Baixo-relevo de Diabásio (sem motivo)", + "block.mineralogy.diabase_relief_cross": "Baixo-relevo de Diabásio (cruz)", + "block.mineralogy.diabase_relief_hammer": "Baixo-relevo de Diabásio (martelo)", + "block.mineralogy.diabase_relief_hoe": "Baixo-relevo de Diabásio (enxada)", + "block.mineralogy.diabase_relief_horizontal": "Baixo-relevo de Diabásio (horizontal)", + "block.mineralogy.diabase_relief_i": "Baixo-relevo de Diabásio (I)", + "block.mineralogy.diabase_relief_left": "Baixo-relevo de Diabásio (esquerda)", + "block.mineralogy.diabase_relief_pickaxe": "Baixo-relevo de Diabásio (picareta)", + "block.mineralogy.diabase_relief_plus": "Baixo-relevo de Diabásio (sinal de mais)", + "block.mineralogy.diabase_relief_right": "Baixo-relevo de Diabásio (direita)", + "block.mineralogy.diabase_relief_sword": "Baixo-relevo de Diabásio (espada)", + "block.mineralogy.diabase_relief_vertical": "Baixo-relevo de Diabásio (vertical)", + "block.mineralogy.gabbro_relief_axe": "Baixo-relevo de Gabro (machado)", + "block.mineralogy.gabbro_relief_blank": "Baixo-relevo de Gabro (sem motivo)", + "block.mineralogy.gabbro_relief_cross": "Baixo-relevo de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Baixo-relevo de Gabro (martelo)", + "block.mineralogy.gabbro_relief_hoe": "Baixo-relevo de Gabro (enxada)", + "block.mineralogy.gabbro_relief_horizontal": "Baixo-relevo de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Baixo-relevo de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Baixo-relevo de Gabro (esquerda)", + "block.mineralogy.gabbro_relief_pickaxe": "Baixo-relevo de Gabro (picareta)", + "block.mineralogy.gabbro_relief_plus": "Baixo-relevo de Gabro (sinal de mais)", + "block.mineralogy.gabbro_relief_right": "Baixo-relevo de Gabro (direita)", + "block.mineralogy.gabbro_relief_sword": "Baixo-relevo de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Baixo-relevo de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Baixo-relevo de Peridotito (machado)", + "block.mineralogy.peridotite_relief_blank": "Baixo-relevo de Peridotito (sem motivo)", + "block.mineralogy.peridotite_relief_cross": "Baixo-relevo de Peridotito (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Baixo-relevo de Peridotito (martelo)", + "block.mineralogy.peridotite_relief_hoe": "Baixo-relevo de Peridotito (enxada)", + "block.mineralogy.peridotite_relief_horizontal": "Baixo-relevo de Peridotito (horizontal)", + "block.mineralogy.peridotite_relief_i": "Baixo-relevo de Peridotito (I)", + "block.mineralogy.peridotite_relief_left": "Baixo-relevo de Peridotito (esquerda)", + "block.mineralogy.peridotite_relief_pickaxe": "Baixo-relevo de Peridotito (picareta)", + "block.mineralogy.peridotite_relief_plus": "Baixo-relevo de Peridotito (sinal de mais)", + "block.mineralogy.peridotite_relief_right": "Baixo-relevo de Peridotito (direita)", + "block.mineralogy.peridotite_relief_sword": "Baixo-relevo de Peridotito (espada)", + "block.mineralogy.peridotite_relief_vertical": "Baixo-relevo de Peridotito (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Baixo-relevo de Vidro basáltico (machado)", + "block.mineralogy.basaltic_glass_relief_blank": "Baixo-relevo de Vidro basáltico (sem motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Baixo-relevo de Vidro basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Baixo-relevo de Vidro basáltico (martelo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Baixo-relevo de Vidro basáltico (enxada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Baixo-relevo de Vidro basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Baixo-relevo de Vidro basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Baixo-relevo de Vidro basáltico (esquerda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Baixo-relevo de Vidro basáltico (picareta)", + "block.mineralogy.basaltic_glass_relief_plus": "Baixo-relevo de Vidro basáltico (sinal de mais)", + "block.mineralogy.basaltic_glass_relief_right": "Baixo-relevo de Vidro basáltico (direita)", + "block.mineralogy.basaltic_glass_relief_sword": "Baixo-relevo de Vidro basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Baixo-relevo de Vidro basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Baixo-relevo de Escória (machado)", + "block.mineralogy.scoria_relief_blank": "Baixo-relevo de Escória (sem motivo)", + "block.mineralogy.scoria_relief_cross": "Baixo-relevo de Escória (cruz)", + "block.mineralogy.scoria_relief_hammer": "Baixo-relevo de Escória (martelo)", + "block.mineralogy.scoria_relief_hoe": "Baixo-relevo de Escória (enxada)", + "block.mineralogy.scoria_relief_horizontal": "Baixo-relevo de Escória (horizontal)", + "block.mineralogy.scoria_relief_i": "Baixo-relevo de Escória (I)", + "block.mineralogy.scoria_relief_left": "Baixo-relevo de Escória (esquerda)", + "block.mineralogy.scoria_relief_pickaxe": "Baixo-relevo de Escória (picareta)", + "block.mineralogy.scoria_relief_plus": "Baixo-relevo de Escória (sinal de mais)", + "block.mineralogy.scoria_relief_right": "Baixo-relevo de Escória (direita)", + "block.mineralogy.scoria_relief_sword": "Baixo-relevo de Escória (espada)", + "block.mineralogy.scoria_relief_vertical": "Baixo-relevo de Escória (vertical)", + "block.mineralogy.tuff_relief_axe": "Baixo-relevo de Tufo (machado)", + "block.mineralogy.tuff_relief_blank": "Baixo-relevo de Tufo (sem motivo)", + "block.mineralogy.tuff_relief_cross": "Baixo-relevo de Tufo (cruz)", + "block.mineralogy.tuff_relief_hammer": "Baixo-relevo de Tufo (martelo)", + "block.mineralogy.tuff_relief_hoe": "Baixo-relevo de Tufo (enxada)", + "block.mineralogy.tuff_relief_horizontal": "Baixo-relevo de Tufo (horizontal)", + "block.mineralogy.tuff_relief_i": "Baixo-relevo de Tufo (I)", + "block.mineralogy.tuff_relief_left": "Baixo-relevo de Tufo (esquerda)", + "block.mineralogy.tuff_relief_pickaxe": "Baixo-relevo de Tufo (picareta)", + "block.mineralogy.tuff_relief_plus": "Baixo-relevo de Tufo (sinal de mais)", + "block.mineralogy.tuff_relief_right": "Baixo-relevo de Tufo (direita)", + "block.mineralogy.tuff_relief_sword": "Baixo-relevo de Tufo (espada)", + "block.mineralogy.tuff_relief_vertical": "Baixo-relevo de Tufo (vertical)", + "block.mineralogy.siltstone_relief_axe": "Baixo-relevo de Siltito (machado)", + "block.mineralogy.siltstone_relief_blank": "Baixo-relevo de Siltito (sem motivo)", + "block.mineralogy.siltstone_relief_cross": "Baixo-relevo de Siltito (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Baixo-relevo de Siltito (martelo)", + "block.mineralogy.siltstone_relief_hoe": "Baixo-relevo de Siltito (enxada)", + "block.mineralogy.siltstone_relief_horizontal": "Baixo-relevo de Siltito (horizontal)", + "block.mineralogy.siltstone_relief_i": "Baixo-relevo de Siltito (I)", + "block.mineralogy.siltstone_relief_left": "Baixo-relevo de Siltito (esquerda)", + "block.mineralogy.siltstone_relief_pickaxe": "Baixo-relevo de Siltito (picareta)", + "block.mineralogy.siltstone_relief_plus": "Baixo-relevo de Siltito (sinal de mais)", + "block.mineralogy.siltstone_relief_right": "Baixo-relevo de Siltito (direita)", + "block.mineralogy.siltstone_relief_sword": "Baixo-relevo de Siltito (espada)", + "block.mineralogy.siltstone_relief_vertical": "Baixo-relevo de Siltito (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Baixo-relevo de Sal-gema (machado)", + "block.mineralogy.rock_salt_relief_blank": "Baixo-relevo de Sal-gema (sem motivo)", + "block.mineralogy.rock_salt_relief_cross": "Baixo-relevo de Sal-gema (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Baixo-relevo de Sal-gema (martelo)", + "block.mineralogy.rock_salt_relief_hoe": "Baixo-relevo de Sal-gema (enxada)", + "block.mineralogy.rock_salt_relief_horizontal": "Baixo-relevo de Sal-gema (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Baixo-relevo de Sal-gema (I)", + "block.mineralogy.rock_salt_relief_left": "Baixo-relevo de Sal-gema (esquerda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Baixo-relevo de Sal-gema (picareta)", + "block.mineralogy.rock_salt_relief_plus": "Baixo-relevo de Sal-gema (sinal de mais)", + "block.mineralogy.rock_salt_relief_right": "Baixo-relevo de Sal-gema (direita)", + "block.mineralogy.rock_salt_relief_sword": "Baixo-relevo de Sal-gema (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Baixo-relevo de Sal-gema (vertical)", + "block.mineralogy.hornfels_relief_axe": "Baixo-relevo de Cornubianito (machado)", + "block.mineralogy.hornfels_relief_blank": "Baixo-relevo de Cornubianito (sem motivo)", + "block.mineralogy.hornfels_relief_cross": "Baixo-relevo de Cornubianito (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Baixo-relevo de Cornubianito (martelo)", + "block.mineralogy.hornfels_relief_hoe": "Baixo-relevo de Cornubianito (enxada)", + "block.mineralogy.hornfels_relief_horizontal": "Baixo-relevo de Cornubianito (horizontal)", + "block.mineralogy.hornfels_relief_i": "Baixo-relevo de Cornubianito (I)", + "block.mineralogy.hornfels_relief_left": "Baixo-relevo de Cornubianito (esquerda)", + "block.mineralogy.hornfels_relief_pickaxe": "Baixo-relevo de Cornubianito (picareta)", + "block.mineralogy.hornfels_relief_plus": "Baixo-relevo de Cornubianito (sinal de mais)", + "block.mineralogy.hornfels_relief_right": "Baixo-relevo de Cornubianito (direita)", + "block.mineralogy.hornfels_relief_sword": "Baixo-relevo de Cornubianito (espada)", + "block.mineralogy.hornfels_relief_vertical": "Baixo-relevo de Cornubianito (vertical)", + "block.mineralogy.quartzite_relief_axe": "Baixo-relevo de Quartzito (machado)", + "block.mineralogy.quartzite_relief_blank": "Baixo-relevo de Quartzito (sem motivo)", + "block.mineralogy.quartzite_relief_cross": "Baixo-relevo de Quartzito (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Baixo-relevo de Quartzito (martelo)", + "block.mineralogy.quartzite_relief_hoe": "Baixo-relevo de Quartzito (enxada)", + "block.mineralogy.quartzite_relief_horizontal": "Baixo-relevo de Quartzito (horizontal)", + "block.mineralogy.quartzite_relief_i": "Baixo-relevo de Quartzito (I)", + "block.mineralogy.quartzite_relief_left": "Baixo-relevo de Quartzito (esquerda)", + "block.mineralogy.quartzite_relief_pickaxe": "Baixo-relevo de Quartzito (picareta)", + "block.mineralogy.quartzite_relief_plus": "Baixo-relevo de Quartzito (sinal de mais)", + "block.mineralogy.quartzite_relief_right": "Baixo-relevo de Quartzito (direita)", + "block.mineralogy.quartzite_relief_sword": "Baixo-relevo de Quartzito (espada)", + "block.mineralogy.quartzite_relief_vertical": "Baixo-relevo de Quartzito (vertical)", + "block.mineralogy.novaculite_relief_axe": "Baixo-relevo de Novaculita (machado)", + "block.mineralogy.novaculite_relief_blank": "Baixo-relevo de Novaculita (sem motivo)", + "block.mineralogy.novaculite_relief_cross": "Baixo-relevo de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Baixo-relevo de Novaculita (martelo)", + "block.mineralogy.novaculite_relief_hoe": "Baixo-relevo de Novaculita (enxada)", + "block.mineralogy.novaculite_relief_horizontal": "Baixo-relevo de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Baixo-relevo de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Baixo-relevo de Novaculita (esquerda)", + "block.mineralogy.novaculite_relief_pickaxe": "Baixo-relevo de Novaculita (picareta)", + "block.mineralogy.novaculite_relief_plus": "Baixo-relevo de Novaculita (sinal de mais)", + "block.mineralogy.novaculite_relief_right": "Baixo-relevo de Novaculita (direita)", + "block.mineralogy.novaculite_relief_sword": "Baixo-relevo de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Baixo-relevo de Novaculita (vertical)", + "itemGroup.mineralogy.mineralogy": "Mineralogia", + "itemGroup.mineralogy.rock": "Rochas da Mineralogia", + "itemGroup.mineralogy.stair": "Escadas da Mineralogia", + "itemGroup.mineralogy.slab": "Lajes da Mineralogia", + "itemGroup.mineralogy.wall": "Muros da Mineralogia", + "itemGroup.mineralogy.item": "Itens da Mineralogia", + "block.mineralogy.crude_oil": "Petróleo bruto", + "item.mineralogy.crude_oil_bucket": "Balde de petróleo bruto", + "fluid.mineralogy.crude_oil": "Petróleo bruto", + "advancements.mineralogy.all_the_rocks.title": "Todas as rochas", + "advancements.mineralogy.all_the_rocks.description": "Você encontrou todos os tipos de rocha padrão do Mineralogy!" +} diff --git a/src/main/resources/assets/mineralogy/lang/ru_ru.json b/src/main/resources/assets/mineralogy/lang/ru_ru.json index d53039a91..134ac56f5 100644 --- a/src/main/resources/assets/mineralogy/lang/ru_ru.json +++ b/src/main/resources/assets/mineralogy/lang/ru_ru.json @@ -1,202 +1,202 @@ { "block.mineralogy.andesite": "Андезит", - "block.mineralogy.andesite_stairs": "Андезитовая лестница", - "block.mineralogy.andesite_slab": "Андезитовая плита", - "block.mineralogy.andesite_brick": "Андезитовый кирпич", - "block.mineralogy.andesite_brick_stairs": "Лестница из андезитового кирпича", - "block.mineralogy.andesite_brick_slab": "Плита из андезитового кирпича", - "block.mineralogy.andesite_smooth": "Полированный андезит", - "block.mineralogy.andesite_smooth_stairs": "Андезитовая полированная лестница", - "block.mineralogy.andesite_smooth_slab": "Полированная андезитовая плита", - "block.mineralogy.andesite_smooth_brick": "Андезитовый полированный кирпич", - "block.mineralogy.andesite_smooth_brick_stairs": "Лестница из полированного андезитового кирпича", - "block.mineralogy.andesite_smooth_brick_slab": "Плита из полированного андезитового кирпича", + "block.mineralogy.andesite_stairs": "Ступеньки: Андезит", + "block.mineralogy.andesite_slab": "Плита: Андезит", + "block.mineralogy.andesite_brick": "Кирпичи: Андезит", + "block.mineralogy.andesite_brick_stairs": "Кирпичные ступеньки: Андезит", + "block.mineralogy.andesite_brick_slab": "Кирпичная плита: Андезит", + "block.mineralogy.andesite_smooth": "Полированный блок: Андезит", + "block.mineralogy.andesite_smooth_stairs": "Полированные ступеньки: Андезит", + "block.mineralogy.andesite_smooth_slab": "Полированная плита: Андезит", + "block.mineralogy.andesite_smooth_brick": "Полированные кирпичи: Андезит", + "block.mineralogy.andesite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Андезит", + "block.mineralogy.andesite_smooth_brick_slab": "Плита из полированного кирпича: Андезит", "block.mineralogy.basalt": "Базальт", - "block.mineralogy.basalt_stairs": "Базальтовая лестница", - "block.mineralogy.basalt_slab": "Базальтовая плита", - "block.mineralogy.basalt_brick": "Базальтовый кирпич", - "block.mineralogy.basalt_brick_stairs": "Лестница из базальтового кирпича", - "block.mineralogy.basalt_brick_slab": "Плита из базальтового кирпича", - "block.mineralogy.basalt_smooth": "Полированный базальт", - "block.mineralogy.basalt_smooth_stairs": "Базальтовая полированная лестница", - "block.mineralogy.basalt_smooth_slab": "Базальтовая полированная плита", - "block.mineralogy.basalt_smooth_brick": "Базальтовый полированный кирпич", - "block.mineralogy.basalt_smooth_brick_stairs": "Лестница из полированного базальтового кирпича", - "block.mineralogy.basalt_smooth_brick_slab": "Плита из полированного базальтового кирпича", + "block.mineralogy.basalt_stairs": "Ступеньки: Базальт", + "block.mineralogy.basalt_slab": "Плита: Базальт", + "block.mineralogy.basalt_brick": "Кирпичи: Базальт", + "block.mineralogy.basalt_brick_stairs": "Кирпичные ступеньки: Базальт", + "block.mineralogy.basalt_brick_slab": "Кирпичная плита: Базальт", + "block.mineralogy.basalt_smooth": "Полированный блок: Базальт", + "block.mineralogy.basalt_smooth_stairs": "Полированные ступеньки: Базальт", + "block.mineralogy.basalt_smooth_slab": "Полированная плита: Базальт", + "block.mineralogy.basalt_smooth_brick": "Полированные кирпичи: Базальт", + "block.mineralogy.basalt_smooth_brick_stairs": "Ступеньки из полированного кирпича: Базальт", + "block.mineralogy.basalt_smooth_brick_slab": "Плита из полированного кирпича: Базальт", "block.mineralogy.diorite": "Диорит", - "block.mineralogy.diorite_stairs": "Диоритовая лестница", - "block.mineralogy.diorite_slab": "Плита диорита", - "block.mineralogy.diorite_brick": "Диоритовый кирпич", - "block.mineralogy.diorite_brick_stairs": "Лестница из диоритового кирпича", - "block.mineralogy.diorite_brick_slab": "Плита из диоритового кирпича", - "block.mineralogy.diorite_smooth": "Полированный диорит", - "block.mineralogy.diorite_smooth_stairs": "Лестница из полированного диорита", - "block.mineralogy.diorite_smooth_slab": "Полированная плита диорита", - "block.mineralogy.diorite_smooth_brick": "Диоритовый полированный кирпич", - "block.mineralogy.diorite_smooth_brick_stairs": "Лестница из полированного диорита кирпича", - "block.mineralogy.diorite_smooth_brick_slab": "Плита из полированного кирпича из диорита", + "block.mineralogy.diorite_stairs": "Ступеньки: Диорит", + "block.mineralogy.diorite_slab": "Плита: Диорит", + "block.mineralogy.diorite_brick": "Кирпичи: Диорит", + "block.mineralogy.diorite_brick_stairs": "Кирпичные ступеньки: Диорит", + "block.mineralogy.diorite_brick_slab": "Кирпичная плита: Диорит", + "block.mineralogy.diorite_smooth": "Полированный блок: Диорит", + "block.mineralogy.diorite_smooth_stairs": "Полированные ступеньки: Диорит", + "block.mineralogy.diorite_smooth_slab": "Полированная плита: Диорит", + "block.mineralogy.diorite_smooth_brick": "Полированные кирпичи: Диорит", + "block.mineralogy.diorite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Диорит", + "block.mineralogy.diorite_smooth_brick_slab": "Плита из полированного кирпича: Диорит", "block.mineralogy.granite": "Гранит", - "block.mineralogy.granite_stairs": "Гранитная лестница", - "block.mineralogy.granite_slab": "Гранитная плита", - "block.mineralogy.granite_brick": "Гранитный кирпич", - "block.mineralogy.granite_brick_stairs": "Лестница из гранитного кирпича", - "block.mineralogy.granite_brick_slab": "Гранитная кирпичная плита", - "block.mineralogy.granite_smooth": "Полированный гранит", - "block.mineralogy.granite_smooth_stairs": "Гранитная полированная лестница", - "block.mineralogy.granite_smooth_slab": "Гранитная полированная плита", - "block.mineralogy.granite_smooth_brick": "Гранитный полированный кирпич", - "block.mineralogy.granite_smooth_brick_stairs": "Лестница из гранитного полированного кирпича", - "block.mineralogy.granite_smooth_brick_slab": "Гранитная полированная кирпичная плита", + "block.mineralogy.granite_stairs": "Ступеньки: Гранит", + "block.mineralogy.granite_slab": "Плита: Гранит", + "block.mineralogy.granite_brick": "Кирпичи: Гранит", + "block.mineralogy.granite_brick_stairs": "Кирпичные ступеньки: Гранит", + "block.mineralogy.granite_brick_slab": "Кирпичная плита: Гранит", + "block.mineralogy.granite_smooth": "Полированный блок: Гранит", + "block.mineralogy.granite_smooth_stairs": "Полированные ступеньки: Гранит", + "block.mineralogy.granite_smooth_slab": "Полированная плита: Гранит", + "block.mineralogy.granite_smooth_brick": "Полированные кирпичи: Гранит", + "block.mineralogy.granite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Гранит", + "block.mineralogy.granite_smooth_brick_slab": "Плита из полированного кирпича: Гранит", "block.mineralogy.rhyolite": "Риолит", - "block.mineralogy.rhyolite_stairs": "Риолитовая лестница", - "block.mineralogy.rhyolite_slab": "Риолитовая плита", - "block.mineralogy.rhyolite_brick": "Риолитовый кирпич", - "block.mineralogy.rhyolite_brick_stairs": "Лестница из риолитового кирпича", - "block.mineralogy.rhyolite_brick_slab": "Плита из риолитового кирпича", - "block.mineralogy.rhyolite_smooth": "Полированный риолит", - "block.mineralogy.rhyolite_smooth_stairs": "Лестница из полированного риолита", - "block.mineralogy.rhyolite_smooth_slab": "Риолитовая полированная плита", - "block.mineralogy.rhyolite_smooth_brick": "Риолитовый полированный кирпич", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Лестница из полированного риолитового кирпича", - "block.mineralogy.rhyolite_smooth_brick_slab": "Плита из полированного риолитового кирпича", + "block.mineralogy.rhyolite_stairs": "Ступеньки: Риолит", + "block.mineralogy.rhyolite_slab": "Плита: Риолит", + "block.mineralogy.rhyolite_brick": "Кирпичи: Риолит", + "block.mineralogy.rhyolite_brick_stairs": "Кирпичные ступеньки: Риолит", + "block.mineralogy.rhyolite_brick_slab": "Кирпичная плита: Риолит", + "block.mineralogy.rhyolite_smooth": "Полированный блок: Риолит", + "block.mineralogy.rhyolite_smooth_stairs": "Полированные ступеньки: Риолит", + "block.mineralogy.rhyolite_smooth_slab": "Полированная плита: Риолит", + "block.mineralogy.rhyolite_smooth_brick": "Полированные кирпичи: Риолит", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Риолит", + "block.mineralogy.rhyolite_smooth_brick_slab": "Плита из полированного кирпича: Риолит", "block.mineralogy.pegmatite": "Пегматит", - "block.mineralogy.pegmatite_stairs": "Пегматитовая лестница", - "block.mineralogy.pegmatite_slab": "Пегматитовая плита", - "block.mineralogy.pegmatite_brick": "Пегматитовый кирпич", - "block.mineralogy.pegmatite_brick_stairs": "Лестница из пегматитового кирпича", - "block.mineralogy.pegmatite_brick_slab": "Плита из пегматитового кирпича", - "block.mineralogy.pegmatite_smooth": "Полированный пегматит", - "block.mineralogy.pegmatite_smooth_stairs": "Полированная лестница из пегматита", - "block.mineralogy.pegmatite_smooth_slab": "Пегматитовая полированная плита", - "block.mineralogy.pegmatite_smooth_brick": "Пегматитовый полированный кирпич", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Лестница из полированного кирпича из пегматита", - "block.mineralogy.pegmatite_smooth_brick_slab": "Пегматитовая полированная кирпичная плита", - "block.mineralogy.shale": "Сланец", - "block.mineralogy.shale_stairs": "Сланцевая лестница", - "block.mineralogy.shale_slab": "Сланцевая плита", - "block.mineralogy.shale_brick": "Сланцевый кирпич", - "block.mineralogy.shale_brick_stairs": "Лестница из сланцевого кирпича", - "block.mineralogy.shale_brick_slab": "Плита из сланцевого кирпича", - "block.mineralogy.shale_smooth": "Полированный сланец", - "block.mineralogy.shale_smooth_stairs": "Лестницы из полированного сланца", - "block.mineralogy.shale_smooth_slab": "Полированная плита из сланца", - "block.mineralogy.shale_smooth_brick": "Полированный сланцевый кирпич", - "block.mineralogy.shale_smooth_brick_stairs": "Лестница из полированного сланцевого кирпича", - "block.mineralogy.shale_smooth_brick_slab": "Плита из полированного сланцевого кирпича", + "block.mineralogy.pegmatite_stairs": "Ступеньки: Пегматит", + "block.mineralogy.pegmatite_slab": "Плита: Пегматит", + "block.mineralogy.pegmatite_brick": "Кирпичи: Пегматит", + "block.mineralogy.pegmatite_brick_stairs": "Кирпичные ступеньки: Пегматит", + "block.mineralogy.pegmatite_brick_slab": "Кирпичная плита: Пегматит", + "block.mineralogy.pegmatite_smooth": "Полированный блок: Пегматит", + "block.mineralogy.pegmatite_smooth_stairs": "Полированные ступеньки: Пегматит", + "block.mineralogy.pegmatite_smooth_slab": "Полированная плита: Пегматит", + "block.mineralogy.pegmatite_smooth_brick": "Полированные кирпичи: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_slab": "Плита из полированного кирпича: Пегматит", + "block.mineralogy.shale": "Глинистый сланец", + "block.mineralogy.shale_stairs": "Ступеньки: Глинистый сланец", + "block.mineralogy.shale_slab": "Плита: Глинистый сланец", + "block.mineralogy.shale_brick": "Кирпичи: Глинистый сланец", + "block.mineralogy.shale_brick_stairs": "Кирпичные ступеньки: Глинистый сланец", + "block.mineralogy.shale_brick_slab": "Кирпичная плита: Глинистый сланец", + "block.mineralogy.shale_smooth": "Полированный блок: Глинистый сланец", + "block.mineralogy.shale_smooth_stairs": "Полированные ступеньки: Глинистый сланец", + "block.mineralogy.shale_smooth_slab": "Полированная плита: Глинистый сланец", + "block.mineralogy.shale_smooth_brick": "Полированные кирпичи: Глинистый сланец", + "block.mineralogy.shale_smooth_brick_stairs": "Ступеньки из полированного кирпича: Глинистый сланец", + "block.mineralogy.shale_smooth_brick_slab": "Плита из полированного кирпича: Глинистый сланец", "block.mineralogy.conglomerate": "Конгломерат", - "block.mineralogy.conglomerate_stairs": "Лестница конгломерата", - "block.mineralogy.conglomerate_slab": "Плита из конгломерата", - "block.mineralogy.conglomerate_brick": "Конгломератный кирпич", - "block.mineralogy.conglomerate_brick_stairs": "Кирпичная лестница из конгломерата", - "block.mineralogy.conglomerate_brick_slab": "Кирпичная плита из конгломерата", - "block.mineralogy.conglomerate_smooth": "Полированный конгломерат", - "block.mineralogy.conglomerate_smooth_stairs": "Полированная лестница из конгломерата", - "block.mineralogy.conglomerate_smooth_slab": "Полированная плита из конгломерата", - "block.mineralogy.conglomerate_smooth_brick": "Конгломератный полированный кирпич", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Лестница из полированного кирпича из конгломерата", - "block.mineralogy.conglomerate_smooth_brick_slab": "Плита из полированного кирпича из конгломерата", + "block.mineralogy.conglomerate_stairs": "Ступеньки: Конгломерат", + "block.mineralogy.conglomerate_slab": "Плита: Конгломерат", + "block.mineralogy.conglomerate_brick": "Кирпичи: Конгломерат", + "block.mineralogy.conglomerate_brick_stairs": "Кирпичные ступеньки: Конгломерат", + "block.mineralogy.conglomerate_brick_slab": "Кирпичная плита: Конгломерат", + "block.mineralogy.conglomerate_smooth": "Полированный блок: Конгломерат", + "block.mineralogy.conglomerate_smooth_stairs": "Полированные ступеньки: Конгломерат", + "block.mineralogy.conglomerate_smooth_slab": "Полированная плита: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick": "Полированные кирпичи: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Ступеньки из полированного кирпича: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_slab": "Плита из полированного кирпича: Конгломерат", "block.mineralogy.dolomite": "Доломит", - "block.mineralogy.dolomite_stairs": "Лестница из доломита", - "block.mineralogy.dolomite_slab": "Доломитовая плита", - "block.mineralogy.dolomite_brick": "Доломитовый кирпич", - "block.mineralogy.dolomite_brick_stairs": "Лестница из доломитового кирпича", - "block.mineralogy.dolomite_brick_slab": "Плита из доломитового кирпича", - "block.mineralogy.dolomite_smooth": "Полированный доломит", - "block.mineralogy.dolomite_smooth_stairs": "Полированные лестницы из доломита", - "block.mineralogy.dolomite_smooth_slab": "Полированная доломитовая плита", - "block.mineralogy.dolomite_smooth_brick": "Доломитовый полированный кирпич", - "block.mineralogy.dolomite_smooth_brick_stairs": "Лестница из полированного доломитового кирпича", - "block.mineralogy.dolomite_smooth_brick_slab": "Плита из полированного доломитового кирпича", + "block.mineralogy.dolomite_stairs": "Ступеньки: Доломит", + "block.mineralogy.dolomite_slab": "Плита: Доломит", + "block.mineralogy.dolomite_brick": "Кирпичи: Доломит", + "block.mineralogy.dolomite_brick_stairs": "Кирпичные ступеньки: Доломит", + "block.mineralogy.dolomite_brick_slab": "Кирпичная плита: Доломит", + "block.mineralogy.dolomite_smooth": "Полированный блок: Доломит", + "block.mineralogy.dolomite_smooth_stairs": "Полированные ступеньки: Доломит", + "block.mineralogy.dolomite_smooth_slab": "Полированная плита: Доломит", + "block.mineralogy.dolomite_smooth_brick": "Полированные кирпичи: Доломит", + "block.mineralogy.dolomite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Доломит", + "block.mineralogy.dolomite_smooth_brick_slab": "Плита из полированного кирпича: Доломит", "block.mineralogy.limestone": "Известняк", - "block.mineralogy.limestone_stairs": "Известняковая лестница", - "block.mineralogy.limestone_slab": "Известняковая плита", - "block.mineralogy.limestone_brick": "Известняковый кирпич", - "block.mineralogy.limestone_brick_stairs": "Лестница из известнякового кирпича", - "block.mineralogy.limestone_brick_slab": "Плита из известнякового кирпича", - "block.mineralogy.limestone_smooth": "Полированный известняк", - "block.mineralogy.limestone_smooth_stairs": "Лестницы из полированного известняка", - "block.mineralogy.limestone_smooth_slab": "Полированная плита из известняка", - "block.mineralogy.limestone_smooth_brick": "Полированный кирпич из известняка", - "block.mineralogy.limestone_smooth_brick_stairs": "Лестница из полированного кирпича из известняка", - "block.mineralogy.limestone_smooth_brick_slab": "Плита из полированного известнякового кирпича", - "block.mineralogy.slate": "Шифер", - "block.mineralogy.slate_stairs": "Сланцевая лестница", - "block.mineralogy.slate_slab": "Шиферная плита", - "block.mineralogy.slate_brick": "Сланцевый кирпич", - "block.mineralogy.slate_brick_stairs": "Лестница из шиферного кирпича", - "block.mineralogy.slate_brick_slab": "Кирпичная плита из шифера", - "block.mineralogy.slate_smooth": "Полированный сланец", - "block.mineralogy.slate_smooth_stairs": "Лестница из полированного шифера", - "block.mineralogy.slate_smooth_slab": "Полированная плита из сланца", - "block.mineralogy.slate_smooth_brick": "Кирпич из сланца, полированный", - "block.mineralogy.slate_smooth_brick_stairs": "Лестница из полированного шиферного кирпича", - "block.mineralogy.slate_smooth_brick_slab": "Кирпичная плита из полированного шифера", - "block.mineralogy.schist": "Сланец", - "block.mineralogy.schist_stairs": "Сланцевая лестница", - "block.mineralogy.schist_slab": "Сланцевая плита", - "block.mineralogy.schist_brick": "Кирпич из сланца", - "block.mineralogy.schist_brick_stairs": "Лестница из сланцевого кирпича", - "block.mineralogy.schist_brick_slab": "Кирпичная плита из сланцевого сланца", - "block.mineralogy.schist_smooth": "Полированный сланец", - "block.mineralogy.schist_smooth_stairs": "Лестница из полированного сланца", - "block.mineralogy.schist_smooth_slab": "Полированная плита из сланца", - "block.mineralogy.schist_smooth_brick": "Полированный кирпич из сланца", - "block.mineralogy.schist_smooth_brick_stairs": "Лестница из полированного кирпича из сланца", - "block.mineralogy.schist_smooth_brick_slab": "Плита из полированного кирпича из сланца", + "block.mineralogy.limestone_stairs": "Ступеньки: Известняк", + "block.mineralogy.limestone_slab": "Плита: Известняк", + "block.mineralogy.limestone_brick": "Кирпичи: Известняк", + "block.mineralogy.limestone_brick_stairs": "Кирпичные ступеньки: Известняк", + "block.mineralogy.limestone_brick_slab": "Кирпичная плита: Известняк", + "block.mineralogy.limestone_smooth": "Полированный блок: Известняк", + "block.mineralogy.limestone_smooth_stairs": "Полированные ступеньки: Известняк", + "block.mineralogy.limestone_smooth_slab": "Полированная плита: Известняк", + "block.mineralogy.limestone_smooth_brick": "Полированные кирпичи: Известняк", + "block.mineralogy.limestone_smooth_brick_stairs": "Ступеньки из полированного кирпича: Известняк", + "block.mineralogy.limestone_smooth_brick_slab": "Плита из полированного кирпича: Известняк", + "block.mineralogy.slate": "Аспидный сланец", + "block.mineralogy.slate_stairs": "Ступеньки: Аспидный сланец", + "block.mineralogy.slate_slab": "Плита: Аспидный сланец", + "block.mineralogy.slate_brick": "Кирпичи: Аспидный сланец", + "block.mineralogy.slate_brick_stairs": "Кирпичные ступеньки: Аспидный сланец", + "block.mineralogy.slate_brick_slab": "Кирпичная плита: Аспидный сланец", + "block.mineralogy.slate_smooth": "Полированный блок: Аспидный сланец", + "block.mineralogy.slate_smooth_stairs": "Полированные ступеньки: Аспидный сланец", + "block.mineralogy.slate_smooth_slab": "Полированная плита: Аспидный сланец", + "block.mineralogy.slate_smooth_brick": "Полированные кирпичи: Аспидный сланец", + "block.mineralogy.slate_smooth_brick_stairs": "Ступеньки из полированного кирпича: Аспидный сланец", + "block.mineralogy.slate_smooth_brick_slab": "Плита из полированного кирпича: Аспидный сланец", + "block.mineralogy.schist": "Кристаллический сланец", + "block.mineralogy.schist_stairs": "Ступеньки: Кристаллический сланец", + "block.mineralogy.schist_slab": "Плита: Кристаллический сланец", + "block.mineralogy.schist_brick": "Кирпичи: Кристаллический сланец", + "block.mineralogy.schist_brick_stairs": "Кирпичные ступеньки: Кристаллический сланец", + "block.mineralogy.schist_brick_slab": "Кирпичная плита: Кристаллический сланец", + "block.mineralogy.schist_smooth": "Полированный блок: Кристаллический сланец", + "block.mineralogy.schist_smooth_stairs": "Полированные ступеньки: Кристаллический сланец", + "block.mineralogy.schist_smooth_slab": "Полированная плита: Кристаллический сланец", + "block.mineralogy.schist_smooth_brick": "Полированные кирпичи: Кристаллический сланец", + "block.mineralogy.schist_smooth_brick_stairs": "Ступеньки из полированного кирпича: Кристаллический сланец", + "block.mineralogy.schist_smooth_brick_slab": "Плита из полированного кирпича: Кристаллический сланец", "block.mineralogy.gneiss": "Гнейс", - "block.mineralogy.gneiss_stairs": "Гнейсовая лестница", - "block.mineralogy.gneiss_slab": "Гнейсовая плита", - "block.mineralogy.gneiss_brick": "Гнейсовый кирпич", - "block.mineralogy.gneiss_brick_stairs": "Лестница из гнейсового кирпича", - "block.mineralogy.gneiss_brick_slab": "Кирпичная плита из гнейса", - "block.mineralogy.gneiss_smooth": "Полированный гнейс", - "block.mineralogy.gneiss_smooth_stairs": "Полированная лестница из гнейса", - "block.mineralogy.gneiss_smooth_slab": "Полированная плита из гнейса", - "block.mineralogy.gneiss_smooth_brick": "Гнейсовый полированный кирпич", - "block.mineralogy.gneiss_smooth_brick_stairs": "Лестница из полированного кирпича гнейса", - "block.mineralogy.gneiss_smooth_brick_slab": "Плита из полированного кирпича из гнейса", + "block.mineralogy.gneiss_stairs": "Ступеньки: Гнейс", + "block.mineralogy.gneiss_slab": "Плита: Гнейс", + "block.mineralogy.gneiss_brick": "Кирпичи: Гнейс", + "block.mineralogy.gneiss_brick_stairs": "Кирпичные ступеньки: Гнейс", + "block.mineralogy.gneiss_brick_slab": "Кирпичная плита: Гнейс", + "block.mineralogy.gneiss_smooth": "Полированный блок: Гнейс", + "block.mineralogy.gneiss_smooth_stairs": "Полированные ступеньки: Гнейс", + "block.mineralogy.gneiss_smooth_slab": "Полированная плита: Гнейс", + "block.mineralogy.gneiss_smooth_brick": "Полированные кирпичи: Гнейс", + "block.mineralogy.gneiss_smooth_brick_stairs": "Ступеньки из полированного кирпича: Гнейс", + "block.mineralogy.gneiss_smooth_brick_slab": "Плита из полированного кирпича: Гнейс", "block.mineralogy.marble": "Мрамор", - "block.mineralogy.marble_stairs": "Мраморная лестница", - "block.mineralogy.marble_slab": "Мраморная плита", - "block.mineralogy.marble_brick": "Мраморный кирпич", - "block.mineralogy.marble_brick_stairs": "Лестница из мраморного кирпича", - "block.mineralogy.marble_brick_slab": "Мраморная кирпичная плита", - "block.mineralogy.marble_smooth": "Полированный мрамор", - "block.mineralogy.marble_smooth_stairs": "Мраморная полированная лестница", - "block.mineralogy.marble_smooth_slab": "Мраморная полированная плита", - "block.mineralogy.marble_smooth_brick": "Мраморный полированный кирпич", - "block.mineralogy.marble_smooth_brick_stairs": "Лестница из полированного мрамора из кирпича", - "block.mineralogy.marble_smooth_brick_slab": "Мраморная полированная кирпичная плита", + "block.mineralogy.marble_stairs": "Ступеньки: Мрамор", + "block.mineralogy.marble_slab": "Плита: Мрамор", + "block.mineralogy.marble_brick": "Кирпичи: Мрамор", + "block.mineralogy.marble_brick_stairs": "Кирпичные ступеньки: Мрамор", + "block.mineralogy.marble_brick_slab": "Кирпичная плита: Мрамор", + "block.mineralogy.marble_smooth": "Полированный блок: Мрамор", + "block.mineralogy.marble_smooth_stairs": "Полированные ступеньки: Мрамор", + "block.mineralogy.marble_smooth_slab": "Полированная плита: Мрамор", + "block.mineralogy.marble_smooth_brick": "Полированные кирпичи: Мрамор", + "block.mineralogy.marble_smooth_brick_stairs": "Ступеньки из полированного кирпича: Мрамор", + "block.mineralogy.marble_smooth_brick_slab": "Плита из полированного кирпича: Мрамор", "block.mineralogy.phyllite": "Филлит", - "block.mineralogy.phyllite_stairs": "Филлитовая лестница", - "block.mineralogy.phyllite_slab": "Филлитовая плита", - "block.mineralogy.phyllite_brick": "Филлитовый кирпич", - "block.mineralogy.phyllite_brick_stairs": "Лестница из филлитового кирпича", - "block.mineralogy.phyllite_brick_slab": "Плита из филлитового кирпича", - "block.mineralogy.phyllite_smooth": "Филлит полированный", - "block.mineralogy.phyllite_smooth_stairs": "Лестница из полированного филлита", - "block.mineralogy.phyllite_smooth_slab": "Филлитовая полированная плита", - "block.mineralogy.phyllite_smooth_brick": "Филлитовый полированный кирпич", - "block.mineralogy.phyllite_smooth_brick_stairs": "Лестница из полированного кирпича из филлита", - "block.mineralogy.phyllite_smooth_brick_slab": "Плита из полированного кирпича из филлита", + "block.mineralogy.phyllite_stairs": "Ступеньки: Филлит", + "block.mineralogy.phyllite_slab": "Плита: Филлит", + "block.mineralogy.phyllite_brick": "Кирпичи: Филлит", + "block.mineralogy.phyllite_brick_stairs": "Кирпичные ступеньки: Филлит", + "block.mineralogy.phyllite_brick_slab": "Кирпичная плита: Филлит", + "block.mineralogy.phyllite_smooth": "Полированный блок: Филлит", + "block.mineralogy.phyllite_smooth_stairs": "Полированные ступеньки: Филлит", + "block.mineralogy.phyllite_smooth_slab": "Полированная плита: Филлит", + "block.mineralogy.phyllite_smooth_brick": "Полированные кирпичи: Филлит", + "block.mineralogy.phyllite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Филлит", + "block.mineralogy.phyllite_smooth_brick_slab": "Плита из полированного кирпича: Филлит", "block.mineralogy.amphibolite": "Амфиболит", - "block.mineralogy.amphibolite_stairs": "Амфиболитовая лестница", - "block.mineralogy.amphibolite_slab": "Амфиболитовая плита", - "block.mineralogy.amphibolite_brick": "Амфиболитовый кирпич", - "block.mineralogy.amphibolite_brick_stairs": "Лестница из амфиболитового кирпича", - "block.mineralogy.amphibolite_brick_slab": "Плита из амфиболитового кирпича", - "block.mineralogy.amphibolite_smooth": "Гладкий амфиболит", - "block.mineralogy.amphibolite_smooth_stairs": "Полированные лестницы из амфиболита", - "block.mineralogy.amphibolite_smooth_slab": "Полированная плита из амфиболита", - "block.mineralogy.amphibolite_smooth_brick": "Амфиболитовый полированный кирпич", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Лестница из полированного амфиболитового кирпича", - "block.mineralogy.amphibolite_smooth_brick_slab": "Плита из полированного амфиболитового кирпича", + "block.mineralogy.amphibolite_stairs": "Ступеньки: Амфиболит", + "block.mineralogy.amphibolite_slab": "Плита: Амфиболит", + "block.mineralogy.amphibolite_brick": "Кирпичи: Амфиболит", + "block.mineralogy.amphibolite_brick_stairs": "Кирпичные ступеньки: Амфиболит", + "block.mineralogy.amphibolite_brick_slab": "Кирпичная плита: Амфиболит", + "block.mineralogy.amphibolite_smooth": "Полированный блок: Амфиболит", + "block.mineralogy.amphibolite_smooth_stairs": "Полированные ступеньки: Амфиболит", + "block.mineralogy.amphibolite_smooth_slab": "Полированная плита: Амфиболит", + "block.mineralogy.amphibolite_smooth_brick": "Полированные кирпичи: Амфиболит", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Амфиболит", + "block.mineralogy.amphibolite_smooth_brick_slab": "Плита из полированного кирпича: Амфиболит", "item.mineralogy.gypsum_dust": "Гипсовый порошок", - "item.mineralogy.sulfur_dust": "Порошок серы", + "item.mineralogy.sulfur_dust": "Серный порошок", "item.mineralogy.phosphorous_dust": "Фосфорный порошок", "item.mineralogy.nitrate_dust": "Нитратный порошок", - "item.mineralogy.mineral_fertilizer": "Минеральные удобрения", - "block.mineralogy.chert": "Черт", + "item.mineralogy.mineral_fertilizer": "Минеральное удобрение", + "block.mineralogy.chert": "Кремень", "block.mineralogy.gypsum": "Гипс", "block.mineralogy.pumice": "Пемза", "block.mineralogy.sulfur_block": "Сера", @@ -205,736 +205,736 @@ "block.mineralogy.phosphorous_ore": "Фосфорная руда", "block.mineralogy.nitrate_block": "Нитрат", "block.mineralogy.nitrate_ore": "Нитратная руда", - "block.mineralogy.drywall_black": "Черный гипсокартон", - "block.mineralogy.drywall_red": "Красный гипсокартон", - "block.mineralogy.drywall_green": "Зеленый гипсокартон", - "block.mineralogy.drywall_brown": "Коричневый гипсокартон", - "block.mineralogy.drywall_blue": "Синий гипсокартон", - "block.mineralogy.drywall_purple": "Фиолетовый гипсокартон", - "block.mineralogy.drywall_cyan": "Голубой гипсокартон", - "block.mineralogy.drywall_silver": "Светло-серый гипсокартон", - "block.mineralogy.drywall_gray": "Серый гипсокартон", - "block.mineralogy.drywall_pink": "Розовый гипсокартон", - "block.mineralogy.drywall_lime": "Лаймово-зеленый гипсокартон", - "block.mineralogy.drywall_yellow": "Желтый гипсокартон", - "block.mineralogy.drywall_light_blue": "Голубой гипсокартон", - "block.mineralogy.drywall_magenta": "Пурпурный гипсокартон", - "block.mineralogy.drywall_orange": "Оранжевый гипсокартон", - "block.mineralogy.drywall_white": "Белый гипсокартон", - "block.mineralogy.andesite_wall": "Андезитовая стена", - "block.mineralogy.andesite_brick_wall": "Стена из андезитового кирпича", - "block.mineralogy.andesite_smooth_wall": "Андезитовая полированная стена", - "block.mineralogy.andesite_smooth_brick_wall": "Стена из полированного андезитового кирпича", - "block.mineralogy.basalt_wall": "Базальтовая стена", - "block.mineralogy.basalt_brick_wall": "Стена из базальтового кирпича", - "block.mineralogy.basalt_smooth_wall": "Полированная базальтовая стена", - "block.mineralogy.basalt_smooth_brick_wall": "Стена из полированного базальтового кирпича", - "block.mineralogy.diorite_wall": "Диоритовая стена", - "block.mineralogy.diorite_brick_wall": "Диоритовая кирпичная стена", - "block.mineralogy.diorite_smooth_wall": "Полированная стена из диорита", - "block.mineralogy.diorite_smooth_brick_wall": "Кирпичная стена из полированного диорита", - "block.mineralogy.granite_wall": "Гранитная стена", - "block.mineralogy.granite_brick_wall": "Гранитная кирпичная стена", - "block.mineralogy.granite_smooth_wall": "Гранитная полированная стена", - "block.mineralogy.granite_smooth_brick_wall": "Гранитная полированная кирпичная стена", - "block.mineralogy.rhyolite_wall": "Риолитовая стена", - "block.mineralogy.rhyolite_brick_wall": "Риолитовая кирпичная стена", - "block.mineralogy.rhyolite_smooth_wall": "Полированная стена из риолита", - "block.mineralogy.rhyolite_smooth_brick_wall": "Кирпичная стена из полированного риолита", - "block.mineralogy.pegmatite_wall": "Пегматитовая стена", - "block.mineralogy.pegmatite_brick_wall": "Пегматитовая кирпичная стена", - "block.mineralogy.pegmatite_smooth_wall": "Полированная стена из пегматита", - "block.mineralogy.pegmatite_smooth_brick_wall": "Пегматитовая полированная кирпичная стена", - "block.mineralogy.shale_wall": "Сланцевая стена", - "block.mineralogy.shale_brick_wall": "Кирпичная стена из сланца", - "block.mineralogy.shale_smooth_wall": "Полированная стена из сланца", - "block.mineralogy.shale_smooth_brick_wall": "Стена из полированного сланцевого кирпича", - "block.mineralogy.conglomerate_wall": "Стена Конгломерата", - "block.mineralogy.conglomerate_brick_wall": "Кирпичная стена конгломерата", - "block.mineralogy.conglomerate_smooth_wall": "Полированная стена из конгломерата", - "block.mineralogy.conglomerate_smooth_brick_wall": "Полированная кирпичная стена из конгломерата", - "block.mineralogy.dolomite_wall": "Доломитовая стена", - "block.mineralogy.dolomite_brick_wall": "Стена из доломитового кирпича", - "block.mineralogy.dolomite_smooth_wall": "Полированная стена из доломита", - "block.mineralogy.dolomite_smooth_brick_wall": "Кирпичная стена из полированного доломита", - "block.mineralogy.limestone_wall": "Известняковая стена", - "block.mineralogy.limestone_brick_wall": "Кирпичная стена из известняка", - "block.mineralogy.limestone_smooth_wall": "Полированная стена из известняка", - "block.mineralogy.limestone_smooth_brick_wall": "Кирпичная стена из полированного известняка", - "block.mineralogy.marble_wall": "Мраморная стена", - "block.mineralogy.marble_brick_wall": "Мраморная кирпичная стена", - "block.mineralogy.marble_smooth_wall": "Мраморная полированная стена", - "block.mineralogy.marble_smooth_brick_wall": "Мраморная полированная кирпичная стена", - "block.mineralogy.slate_wall": "Шиферная стена", - "block.mineralogy.slate_brick_wall": "Кирпичная стена из шифера", - "block.mineralogy.slate_smooth_wall": "Полированная стена из сланца", - "block.mineralogy.slate_smooth_brick_wall": "Полированная кирпичная стена из шифера", - "block.mineralogy.schist_wall": "Сланцевая стена", - "block.mineralogy.schist_brick_wall": "Кирпичная стена из сланца", - "block.mineralogy.schist_smooth_wall": "Полированная стена из сланца", - "block.mineralogy.schist_smooth_brick_wall": "Полированная кирпичная стена из сланца", - "block.mineralogy.gneiss_wall": "Гнейсовая стена", - "block.mineralogy.gneiss_brick_wall": "Кирпичная стена из гнейса", - "block.mineralogy.gneiss_smooth_wall": "Полированная стена из гнейса", - "block.mineralogy.gneiss_smooth_brick_wall": "Полированная кирпичная стена из гнейса", - "block.mineralogy.phyllite_wall": "Филлитовая стена", - "block.mineralogy.phyllite_brick_wall": "Кирпичная стена из филлита", - "block.mineralogy.phyllite_smooth_wall": "Полированная стена из филлита", - "block.mineralogy.phyllite_smooth_brick_wall": "Кирпичная стена из полированного филлита", - "block.mineralogy.amphibolite_wall": "Амфиболитовая стена", - "block.mineralogy.amphibolite_brick_wall": "Стена из амфиболитового кирпича", - "block.mineralogy.amphibolite_smooth_wall": "Полированная стена из амфиболита", - "block.mineralogy.amphibolite_smooth_brick_wall": "Стена из полированного амфиболита из кирпича", - "block.mineralogy.andesite_furnace": "Андезитовая печь", - "block.mineralogy.andesite_brick_furnace": "Печь из андезитового кирпича", - "block.mineralogy.andesite_smooth_furnace": "Печь для полировки андезита", - "block.mineralogy.andesite_smooth_brick_furnace": "Печь из андезитового полированного кирпича", - "block.mineralogy.basalt_furnace": "Базальтовая печь", - "block.mineralogy.basalt_brick_furnace": "Печь из базальтового кирпича", - "block.mineralogy.basalt_smooth_furnace": "Базальтовая полированная печь", - "block.mineralogy.basalt_smooth_brick_furnace": "Печь из базальтового полированного кирпича", - "block.mineralogy.diorite_furnace": "Диоритовая печь", - "block.mineralogy.diorite_brick_furnace": "Печь из диоритового кирпича", - "block.mineralogy.diorite_smooth_furnace": "Печь для полировки диорита", - "block.mineralogy.diorite_smooth_brick_furnace": "Печь из полированного кирпича из диорита", - "block.mineralogy.granite_furnace": "Гранитная печь", - "block.mineralogy.granite_brick_furnace": "Печь из гранитного кирпича", - "block.mineralogy.granite_smooth_furnace": "Гранитная полированная печь", - "block.mineralogy.granite_smooth_brick_furnace": "Печь из гранитного полированного кирпича", - "block.mineralogy.rhyolite_furnace": "Риолитовая печь", - "block.mineralogy.rhyolite_brick_furnace": "Печь из риолитового кирпича", - "block.mineralogy.rhyolite_smooth_furnace": "Печь для полировки риолита", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Печь из полированного кирпича из риолита", - "block.mineralogy.pegmatite_furnace": "Пегматитовая печь", - "block.mineralogy.pegmatite_brick_furnace": "Пегматитовая кирпичная печь", - "block.mineralogy.pegmatite_smooth_furnace": "Пегматитовая полированная печь", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Пегматитовая печь из полированного кирпича", - "block.mineralogy.shale_furnace": "Сланцевая печь", - "block.mineralogy.shale_brick_furnace": "Печь из сланцевого кирпича", - "block.mineralogy.shale_smooth_furnace": "Печь для полировки сланца", - "block.mineralogy.shale_smooth_brick_furnace": "Печь из полированного кирпича из сланца", - "block.mineralogy.conglomerate_furnace": "Печь для конгломерата", - "block.mineralogy.conglomerate_brick_furnace": "Кирпичная печь из конгломерата", - "block.mineralogy.conglomerate_smooth_furnace": "Печь для полировки конгломерата", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Печь из полированного кирпича из конгломерата", - "block.mineralogy.dolomite_furnace": "Доломитовая печь", - "block.mineralogy.dolomite_brick_furnace": "Печь из доломитового кирпича", - "block.mineralogy.dolomite_smooth_furnace": "Печь для полировки доломита", - "block.mineralogy.dolomite_smooth_brick_furnace": "Печь из полированного доломитового кирпича", - "block.mineralogy.limestone_furnace": "Известняковая печь", - "block.mineralogy.limestone_brick_furnace": "Печь из известнякового кирпича", - "block.mineralogy.limestone_smooth_furnace": "Печь для полировки известняка", - "block.mineralogy.limestone_smooth_brick_furnace": "Печь из полированного кирпича из известняка", - "block.mineralogy.marble_furnace": "Мраморная печь", - "block.mineralogy.marble_brick_furnace": "Печь из мраморного кирпича", - "block.mineralogy.marble_smooth_furnace": "Печь для полировки мрамора", - "block.mineralogy.marble_smooth_brick_furnace": "Печь из мраморного полированного кирпича", - "block.mineralogy.slate_furnace": "Шиферная печь", - "block.mineralogy.slate_brick_furnace": "Печь из шиферного кирпича", - "block.mineralogy.slate_smooth_furnace": "Печь для полировки сланца", - "block.mineralogy.slate_smooth_brick_furnace": "Печь из полированного кирпича из сланца", - "block.mineralogy.schist_furnace": "Сланцевая печь", - "block.mineralogy.schist_brick_furnace": "Печь из сланцевого кирпича", - "block.mineralogy.schist_smooth_furnace": "Печь для полировки сланца", - "block.mineralogy.schist_smooth_brick_furnace": "Печь из полированного кирпича из сланца", - "block.mineralogy.gneiss_furnace": "Гнейсовая печь", - "block.mineralogy.gneiss_brick_furnace": "Кирпичная печь из гнейса", - "block.mineralogy.gneiss_smooth_furnace": "Печь для полировки гнейса", - "block.mineralogy.gneiss_smooth_brick_furnace": "Печь из полированного кирпича из гнейса", - "block.mineralogy.phyllite_furnace": "Филлитовая печь", - "block.mineralogy.phyllite_brick_furnace": "Печь из филлитового кирпича", - "block.mineralogy.phyllite_smooth_furnace": "Печь для полировки филлита", - "block.mineralogy.phyllite_smooth_brick_furnace": "Печь из полированного кирпича из филлита", - "block.mineralogy.amphibolite_furnace": "Амфиболитовая печь", - "block.mineralogy.amphibolite_brick_furnace": "Печь из амфиболитового кирпича", - "block.mineralogy.amphibolite_smooth_furnace": "Печь для полировки амфиболита", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Печь из полированного амфиболитового кирпича", + "block.mineralogy.drywall_black": "Гипсокартон (чёрный)", + "block.mineralogy.drywall_red": "Гипсокартон (красный)", + "block.mineralogy.drywall_green": "Гипсокартон (зелёный)", + "block.mineralogy.drywall_brown": "Гипсокартон (коричневый)", + "block.mineralogy.drywall_blue": "Гипсокартон (синий)", + "block.mineralogy.drywall_purple": "Гипсокартон (фиолетовый)", + "block.mineralogy.drywall_cyan": "Гипсокартон (бирюзовый)", + "block.mineralogy.drywall_silver": "Гипсокартон (светло-серый)", + "block.mineralogy.drywall_gray": "Гипсокартон (серый)", + "block.mineralogy.drywall_pink": "Гипсокартон (розовый)", + "block.mineralogy.drywall_lime": "Гипсокартон (лаймовый)", + "block.mineralogy.drywall_yellow": "Гипсокартон (жёлтый)", + "block.mineralogy.drywall_light_blue": "Гипсокартон (голубой)", + "block.mineralogy.drywall_magenta": "Гипсокартон (пурпурный)", + "block.mineralogy.drywall_orange": "Гипсокартон (оранжевый)", + "block.mineralogy.drywall_white": "Гипсокартон (белый)", + "block.mineralogy.andesite_wall": "Ограда: Андезит", + "block.mineralogy.andesite_brick_wall": "Кирпичная ограда: Андезит", + "block.mineralogy.andesite_smooth_wall": "Полированная ограда: Андезит", + "block.mineralogy.andesite_smooth_brick_wall": "Ограда из полированного кирпича: Андезит", + "block.mineralogy.basalt_wall": "Ограда: Базальт", + "block.mineralogy.basalt_brick_wall": "Кирпичная ограда: Базальт", + "block.mineralogy.basalt_smooth_wall": "Полированная ограда: Базальт", + "block.mineralogy.basalt_smooth_brick_wall": "Ограда из полированного кирпича: Базальт", + "block.mineralogy.diorite_wall": "Ограда: Диорит", + "block.mineralogy.diorite_brick_wall": "Кирпичная ограда: Диорит", + "block.mineralogy.diorite_smooth_wall": "Полированная ограда: Диорит", + "block.mineralogy.diorite_smooth_brick_wall": "Ограда из полированного кирпича: Диорит", + "block.mineralogy.granite_wall": "Ограда: Гранит", + "block.mineralogy.granite_brick_wall": "Кирпичная ограда: Гранит", + "block.mineralogy.granite_smooth_wall": "Полированная ограда: Гранит", + "block.mineralogy.granite_smooth_brick_wall": "Ограда из полированного кирпича: Гранит", + "block.mineralogy.rhyolite_wall": "Ограда: Риолит", + "block.mineralogy.rhyolite_brick_wall": "Кирпичная ограда: Риолит", + "block.mineralogy.rhyolite_smooth_wall": "Полированная ограда: Риолит", + "block.mineralogy.rhyolite_smooth_brick_wall": "Ограда из полированного кирпича: Риолит", + "block.mineralogy.pegmatite_wall": "Ограда: Пегматит", + "block.mineralogy.pegmatite_brick_wall": "Кирпичная ограда: Пегматит", + "block.mineralogy.pegmatite_smooth_wall": "Полированная ограда: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_wall": "Ограда из полированного кирпича: Пегматит", + "block.mineralogy.shale_wall": "Ограда: Глинистый сланец", + "block.mineralogy.shale_brick_wall": "Кирпичная ограда: Глинистый сланец", + "block.mineralogy.shale_smooth_wall": "Полированная ограда: Глинистый сланец", + "block.mineralogy.shale_smooth_brick_wall": "Ограда из полированного кирпича: Глинистый сланец", + "block.mineralogy.conglomerate_wall": "Ограда: Конгломерат", + "block.mineralogy.conglomerate_brick_wall": "Кирпичная ограда: Конгломерат", + "block.mineralogy.conglomerate_smooth_wall": "Полированная ограда: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_wall": "Ограда из полированного кирпича: Конгломерат", + "block.mineralogy.dolomite_wall": "Ограда: Доломит", + "block.mineralogy.dolomite_brick_wall": "Кирпичная ограда: Доломит", + "block.mineralogy.dolomite_smooth_wall": "Полированная ограда: Доломит", + "block.mineralogy.dolomite_smooth_brick_wall": "Ограда из полированного кирпича: Доломит", + "block.mineralogy.limestone_wall": "Ограда: Известняк", + "block.mineralogy.limestone_brick_wall": "Кирпичная ограда: Известняк", + "block.mineralogy.limestone_smooth_wall": "Полированная ограда: Известняк", + "block.mineralogy.limestone_smooth_brick_wall": "Ограда из полированного кирпича: Известняк", + "block.mineralogy.marble_wall": "Ограда: Мрамор", + "block.mineralogy.marble_brick_wall": "Кирпичная ограда: Мрамор", + "block.mineralogy.marble_smooth_wall": "Полированная ограда: Мрамор", + "block.mineralogy.marble_smooth_brick_wall": "Ограда из полированного кирпича: Мрамор", + "block.mineralogy.slate_wall": "Ограда: Аспидный сланец", + "block.mineralogy.slate_brick_wall": "Кирпичная ограда: Аспидный сланец", + "block.mineralogy.slate_smooth_wall": "Полированная ограда: Аспидный сланец", + "block.mineralogy.slate_smooth_brick_wall": "Ограда из полированного кирпича: Аспидный сланец", + "block.mineralogy.schist_wall": "Ограда: Кристаллический сланец", + "block.mineralogy.schist_brick_wall": "Кирпичная ограда: Кристаллический сланец", + "block.mineralogy.schist_smooth_wall": "Полированная ограда: Кристаллический сланец", + "block.mineralogy.schist_smooth_brick_wall": "Ограда из полированного кирпича: Кристаллический сланец", + "block.mineralogy.gneiss_wall": "Ограда: Гнейс", + "block.mineralogy.gneiss_brick_wall": "Кирпичная ограда: Гнейс", + "block.mineralogy.gneiss_smooth_wall": "Полированная ограда: Гнейс", + "block.mineralogy.gneiss_smooth_brick_wall": "Ограда из полированного кирпича: Гнейс", + "block.mineralogy.phyllite_wall": "Ограда: Филлит", + "block.mineralogy.phyllite_brick_wall": "Кирпичная ограда: Филлит", + "block.mineralogy.phyllite_smooth_wall": "Полированная ограда: Филлит", + "block.mineralogy.phyllite_smooth_brick_wall": "Ограда из полированного кирпича: Филлит", + "block.mineralogy.amphibolite_wall": "Ограда: Амфиболит", + "block.mineralogy.amphibolite_brick_wall": "Кирпичная ограда: Амфиболит", + "block.mineralogy.amphibolite_smooth_wall": "Полированная ограда: Амфиболит", + "block.mineralogy.amphibolite_smooth_brick_wall": "Ограда из полированного кирпича: Амфиболит", + "block.mineralogy.andesite_furnace": "Печь: Андезит", + "block.mineralogy.andesite_brick_furnace": "Кирпичная печь: Андезит", + "block.mineralogy.andesite_smooth_furnace": "Полированная печь: Андезит", + "block.mineralogy.andesite_smooth_brick_furnace": "Печь из полированного кирпича: Андезит", + "block.mineralogy.basalt_furnace": "Печь: Базальт", + "block.mineralogy.basalt_brick_furnace": "Кирпичная печь: Базальт", + "block.mineralogy.basalt_smooth_furnace": "Полированная печь: Базальт", + "block.mineralogy.basalt_smooth_brick_furnace": "Печь из полированного кирпича: Базальт", + "block.mineralogy.diorite_furnace": "Печь: Диорит", + "block.mineralogy.diorite_brick_furnace": "Кирпичная печь: Диорит", + "block.mineralogy.diorite_smooth_furnace": "Полированная печь: Диорит", + "block.mineralogy.diorite_smooth_brick_furnace": "Печь из полированного кирпича: Диорит", + "block.mineralogy.granite_furnace": "Печь: Гранит", + "block.mineralogy.granite_brick_furnace": "Кирпичная печь: Гранит", + "block.mineralogy.granite_smooth_furnace": "Полированная печь: Гранит", + "block.mineralogy.granite_smooth_brick_furnace": "Печь из полированного кирпича: Гранит", + "block.mineralogy.rhyolite_furnace": "Печь: Риолит", + "block.mineralogy.rhyolite_brick_furnace": "Кирпичная печь: Риолит", + "block.mineralogy.rhyolite_smooth_furnace": "Полированная печь: Риолит", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Печь из полированного кирпича: Риолит", + "block.mineralogy.pegmatite_furnace": "Печь: Пегматит", + "block.mineralogy.pegmatite_brick_furnace": "Кирпичная печь: Пегматит", + "block.mineralogy.pegmatite_smooth_furnace": "Полированная печь: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Печь из полированного кирпича: Пегматит", + "block.mineralogy.shale_furnace": "Печь: Глинистый сланец", + "block.mineralogy.shale_brick_furnace": "Кирпичная печь: Глинистый сланец", + "block.mineralogy.shale_smooth_furnace": "Полированная печь: Глинистый сланец", + "block.mineralogy.shale_smooth_brick_furnace": "Печь из полированного кирпича: Глинистый сланец", + "block.mineralogy.conglomerate_furnace": "Печь: Конгломерат", + "block.mineralogy.conglomerate_brick_furnace": "Кирпичная печь: Конгломерат", + "block.mineralogy.conglomerate_smooth_furnace": "Полированная печь: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Печь из полированного кирпича: Конгломерат", + "block.mineralogy.dolomite_furnace": "Печь: Доломит", + "block.mineralogy.dolomite_brick_furnace": "Кирпичная печь: Доломит", + "block.mineralogy.dolomite_smooth_furnace": "Полированная печь: Доломит", + "block.mineralogy.dolomite_smooth_brick_furnace": "Печь из полированного кирпича: Доломит", + "block.mineralogy.limestone_furnace": "Печь: Известняк", + "block.mineralogy.limestone_brick_furnace": "Кирпичная печь: Известняк", + "block.mineralogy.limestone_smooth_furnace": "Полированная печь: Известняк", + "block.mineralogy.limestone_smooth_brick_furnace": "Печь из полированного кирпича: Известняк", + "block.mineralogy.marble_furnace": "Печь: Мрамор", + "block.mineralogy.marble_brick_furnace": "Кирпичная печь: Мрамор", + "block.mineralogy.marble_smooth_furnace": "Полированная печь: Мрамор", + "block.mineralogy.marble_smooth_brick_furnace": "Печь из полированного кирпича: Мрамор", + "block.mineralogy.slate_furnace": "Печь: Аспидный сланец", + "block.mineralogy.slate_brick_furnace": "Кирпичная печь: Аспидный сланец", + "block.mineralogy.slate_smooth_furnace": "Полированная печь: Аспидный сланец", + "block.mineralogy.slate_smooth_brick_furnace": "Печь из полированного кирпича: Аспидный сланец", + "block.mineralogy.schist_furnace": "Печь: Кристаллический сланец", + "block.mineralogy.schist_brick_furnace": "Кирпичная печь: Кристаллический сланец", + "block.mineralogy.schist_smooth_furnace": "Полированная печь: Кристаллический сланец", + "block.mineralogy.schist_smooth_brick_furnace": "Печь из полированного кирпича: Кристаллический сланец", + "block.mineralogy.gneiss_furnace": "Печь: Гнейс", + "block.mineralogy.gneiss_brick_furnace": "Кирпичная печь: Гнейс", + "block.mineralogy.gneiss_smooth_furnace": "Полированная печь: Гнейс", + "block.mineralogy.gneiss_smooth_brick_furnace": "Печь из полированного кирпича: Гнейс", + "block.mineralogy.phyllite_furnace": "Печь: Филлит", + "block.mineralogy.phyllite_brick_furnace": "Кирпичная печь: Филлит", + "block.mineralogy.phyllite_smooth_furnace": "Полированная печь: Филлит", + "block.mineralogy.phyllite_smooth_brick_furnace": "Печь из полированного кирпича: Филлит", + "block.mineralogy.amphibolite_furnace": "Печь: Амфиболит", + "block.mineralogy.amphibolite_brick_furnace": "Кирпичная печь: Амфиболит", + "block.mineralogy.amphibolite_smooth_furnace": "Полированная печь: Амфиболит", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Печь из полированного кирпича: Амфиболит", "block.mineralogy.diabase": "Диабаз", - "block.mineralogy.diabase_stairs": "Лестница из диабаза", - "block.mineralogy.diabase_slab": "Диабазовая плита", - "block.mineralogy.diabase_brick": "Диабазовый кирпич", - "block.mineralogy.diabase_brick_stairs": "Лестница из диабазового кирпича", - "block.mineralogy.diabase_brick_slab": "Плита из диабазового кирпича", - "block.mineralogy.diabase_smooth": "Полированный диабаз", - "block.mineralogy.diabase_smooth_stairs": "Полированные лестницы из диабаза", - "block.mineralogy.diabase_smooth_slab": "Полированная плита из диабаза", - "block.mineralogy.diabase_smooth_brick": "Кирпич полированный из диабаза", - "block.mineralogy.diabase_smooth_brick_stairs": "Лестница из полированного кирпича диабаза", - "block.mineralogy.diabase_smooth_brick_slab": "Плита из полированного кирпича из диабаза", - "block.mineralogy.diabase_wall": "Стена из диабаза", - "block.mineralogy.diabase_brick_wall": "Кирпичная стена из диабаза", - "block.mineralogy.diabase_smooth_wall": "Полированная стена из диабаза", - "block.mineralogy.diabase_smooth_brick_wall": "Полированная кирпичная стена из диабаза", - "block.mineralogy.diabase_furnace": "Диабазовая печь", - "block.mineralogy.diabase_brick_furnace": "Печь из диабазового кирпича", - "block.mineralogy.diabase_smooth_furnace": "Печь для полировки диабаза", - "block.mineralogy.diabase_smooth_brick_furnace": "Печь из полированного кирпича из диабаза", + "block.mineralogy.diabase_stairs": "Ступеньки: Диабаз", + "block.mineralogy.diabase_slab": "Плита: Диабаз", + "block.mineralogy.diabase_brick": "Кирпичи: Диабаз", + "block.mineralogy.diabase_brick_stairs": "Кирпичные ступеньки: Диабаз", + "block.mineralogy.diabase_brick_slab": "Кирпичная плита: Диабаз", + "block.mineralogy.diabase_smooth": "Полированный блок: Диабаз", + "block.mineralogy.diabase_smooth_stairs": "Полированные ступеньки: Диабаз", + "block.mineralogy.diabase_smooth_slab": "Полированная плита: Диабаз", + "block.mineralogy.diabase_smooth_brick": "Полированные кирпичи: Диабаз", + "block.mineralogy.diabase_smooth_brick_stairs": "Ступеньки из полированного кирпича: Диабаз", + "block.mineralogy.diabase_smooth_brick_slab": "Плита из полированного кирпича: Диабаз", + "block.mineralogy.diabase_wall": "Ограда: Диабаз", + "block.mineralogy.diabase_brick_wall": "Кирпичная ограда: Диабаз", + "block.mineralogy.diabase_smooth_wall": "Полированная ограда: Диабаз", + "block.mineralogy.diabase_smooth_brick_wall": "Ограда из полированного кирпича: Диабаз", + "block.mineralogy.diabase_furnace": "Печь: Диабаз", + "block.mineralogy.diabase_brick_furnace": "Кирпичная печь: Диабаз", + "block.mineralogy.diabase_smooth_furnace": "Полированная печь: Диабаз", + "block.mineralogy.diabase_smooth_brick_furnace": "Печь из полированного кирпича: Диабаз", "block.mineralogy.gabbro": "Габбро", - "block.mineralogy.gabbro_stairs": "Лестница Габбро", - "block.mineralogy.gabbro_slab": "Плита габбро", - "block.mineralogy.gabbro_brick": "Габбро Кирпич", - "block.mineralogy.gabbro_brick_stairs": "Лестница из кирпича Габбро", - "block.mineralogy.gabbro_brick_slab": "Кирпичная плита Габбро", - "block.mineralogy.gabbro_smooth": "Полированное габбро", - "block.mineralogy.gabbro_smooth_stairs": "Полированная лестница из габбро", - "block.mineralogy.gabbro_smooth_slab": "Полированная плита габбро", - "block.mineralogy.gabbro_smooth_brick": "Полированный кирпич Габбро", - "block.mineralogy.gabbro_smooth_brick_stairs": "Лестница из полированного кирпича габбро", - "block.mineralogy.gabbro_smooth_brick_slab": "Плита из полированного кирпича габбро", - "block.mineralogy.gabbro_wall": "Стена габбро", - "block.mineralogy.gabbro_brick_wall": "Кирпичная стена из габбро", - "block.mineralogy.gabbro_smooth_wall": "Полированная стена из габбро", - "block.mineralogy.gabbro_smooth_brick_wall": "Полированная кирпичная стена с габбро", - "block.mineralogy.gabbro_furnace": "Печь габбро", - "block.mineralogy.gabbro_brick_furnace": "Кирпичная печь из габбро", - "block.mineralogy.gabbro_smooth_furnace": "Печь для полировки габбро", - "block.mineralogy.gabbro_smooth_brick_furnace": "Печь из полированного кирпича габбро", + "block.mineralogy.gabbro_stairs": "Ступеньки: Габбро", + "block.mineralogy.gabbro_slab": "Плита: Габбро", + "block.mineralogy.gabbro_brick": "Кирпичи: Габбро", + "block.mineralogy.gabbro_brick_stairs": "Кирпичные ступеньки: Габбро", + "block.mineralogy.gabbro_brick_slab": "Кирпичная плита: Габбро", + "block.mineralogy.gabbro_smooth": "Полированный блок: Габбро", + "block.mineralogy.gabbro_smooth_stairs": "Полированные ступеньки: Габбро", + "block.mineralogy.gabbro_smooth_slab": "Полированная плита: Габбро", + "block.mineralogy.gabbro_smooth_brick": "Полированные кирпичи: Габбро", + "block.mineralogy.gabbro_smooth_brick_stairs": "Ступеньки из полированного кирпича: Габбро", + "block.mineralogy.gabbro_smooth_brick_slab": "Плита из полированного кирпича: Габбро", + "block.mineralogy.gabbro_wall": "Ограда: Габбро", + "block.mineralogy.gabbro_brick_wall": "Кирпичная ограда: Габбро", + "block.mineralogy.gabbro_smooth_wall": "Полированная ограда: Габбро", + "block.mineralogy.gabbro_smooth_brick_wall": "Ограда из полированного кирпича: Габбро", + "block.mineralogy.gabbro_furnace": "Печь: Габбро", + "block.mineralogy.gabbro_brick_furnace": "Кирпичная печь: Габбро", + "block.mineralogy.gabbro_smooth_furnace": "Полированная печь: Габбро", + "block.mineralogy.gabbro_smooth_brick_furnace": "Печь из полированного кирпича: Габбро", "block.mineralogy.peridotite": "Перидотит", - "block.mineralogy.peridotite_stairs": "Перидотитовая лестница", - "block.mineralogy.peridotite_slab": "Плита перидотита", - "block.mineralogy.peridotite_brick": "Перидотитовый кирпич", - "block.mineralogy.peridotite_brick_stairs": "Лестница из перидотитового кирпича", - "block.mineralogy.peridotite_brick_slab": "Плита из перидотитового кирпича", - "block.mineralogy.peridotite_smooth": "Полированный перидотит", - "block.mineralogy.peridotite_smooth_stairs": "Полированная лестница из перидотита", - "block.mineralogy.peridotite_smooth_slab": "Полированная плита перидотита", - "block.mineralogy.peridotite_smooth_brick": "Полированный перидотитовый кирпич", - "block.mineralogy.peridotite_smooth_brick_stairs": "Лестница из полированного перидотитового кирпича", - "block.mineralogy.peridotite_smooth_brick_slab": "Плита из полированного перидотитового кирпича", - "block.mineralogy.peridotite_wall": "Перидотитовая стена", - "block.mineralogy.peridotite_brick_wall": "Кирпичная стена из перидотита", - "block.mineralogy.peridotite_smooth_wall": "Полированная стена из перидотита", - "block.mineralogy.peridotite_smooth_brick_wall": "Полированная кирпичная стена с перидотитом", - "block.mineralogy.peridotite_furnace": "Перидотитовая печь", - "block.mineralogy.peridotite_brick_furnace": "Печь из перидотитового кирпича", - "block.mineralogy.peridotite_smooth_furnace": "Печь для полировки перидотита", - "block.mineralogy.peridotite_smooth_brick_furnace": "Печь из полированного кирпича из перидотита", + "block.mineralogy.peridotite_stairs": "Ступеньки: Перидотит", + "block.mineralogy.peridotite_slab": "Плита: Перидотит", + "block.mineralogy.peridotite_brick": "Кирпичи: Перидотит", + "block.mineralogy.peridotite_brick_stairs": "Кирпичные ступеньки: Перидотит", + "block.mineralogy.peridotite_brick_slab": "Кирпичная плита: Перидотит", + "block.mineralogy.peridotite_smooth": "Полированный блок: Перидотит", + "block.mineralogy.peridotite_smooth_stairs": "Полированные ступеньки: Перидотит", + "block.mineralogy.peridotite_smooth_slab": "Полированная плита: Перидотит", + "block.mineralogy.peridotite_smooth_brick": "Полированные кирпичи: Перидотит", + "block.mineralogy.peridotite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Перидотит", + "block.mineralogy.peridotite_smooth_brick_slab": "Плита из полированного кирпича: Перидотит", + "block.mineralogy.peridotite_wall": "Ограда: Перидотит", + "block.mineralogy.peridotite_brick_wall": "Кирпичная ограда: Перидотит", + "block.mineralogy.peridotite_smooth_wall": "Полированная ограда: Перидотит", + "block.mineralogy.peridotite_smooth_brick_wall": "Ограда из полированного кирпича: Перидотит", + "block.mineralogy.peridotite_furnace": "Печь: Перидотит", + "block.mineralogy.peridotite_brick_furnace": "Кирпичная печь: Перидотит", + "block.mineralogy.peridotite_smooth_furnace": "Полированная печь: Перидотит", + "block.mineralogy.peridotite_smooth_brick_furnace": "Печь из полированного кирпича: Перидотит", "block.mineralogy.basaltic_glass": "Базальтовое стекло", - "block.mineralogy.basaltic_glass_stairs": "Лестницы из базальтового стекла", - "block.mineralogy.basaltic_glass_slab": "Плита из базальтового стекла", - "block.mineralogy.basaltic_glass_brick": "Базальтовый стеклянный кирпич", - "block.mineralogy.basaltic_glass_brick_stairs": "Лестница из базальтового стеклянного кирпича", - "block.mineralogy.basaltic_glass_brick_slab": "Кирпичная плита из базальтового стекла", - "block.mineralogy.basaltic_glass_smooth": "Полированное базальтовое стекло", - "block.mineralogy.basaltic_glass_smooth_stairs": "Лестницы из полированного базальтового стекла", - "block.mineralogy.basaltic_glass_smooth_slab": "Полированная плита из базальтового стекла", - "block.mineralogy.basaltic_glass_smooth_brick": "Базальтовый стеклянный полированный кирпич", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Лестница из полированного кирпича из базальтового стекла", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Плита из полированного кирпича из базальтового стекла", - "block.mineralogy.basaltic_glass_wall": "Стена из базальтового стекла", - "block.mineralogy.basaltic_glass_brick_wall": "Кирпичная стена из базальтового стекла", - "block.mineralogy.basaltic_glass_smooth_wall": "Полированная стена из базальтового стекла", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Кирпичная стена из полированного базальтового стекла", - "block.mineralogy.basaltic_glass_furnace": "Базальтовая стекловаренная печь", - "block.mineralogy.basaltic_glass_brick_furnace": "Печь из базальтового стеклокирпича", - "block.mineralogy.basaltic_glass_smooth_furnace": "Печь для полировки базальтового стекла", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Печь из базальтового стекла и полированного кирпича", + "block.mineralogy.basaltic_glass_stairs": "Ступеньки: Базальтовое стекло", + "block.mineralogy.basaltic_glass_slab": "Плита: Базальтовое стекло", + "block.mineralogy.basaltic_glass_brick": "Кирпичи: Базальтовое стекло", + "block.mineralogy.basaltic_glass_brick_stairs": "Кирпичные ступеньки: Базальтовое стекло", + "block.mineralogy.basaltic_glass_brick_slab": "Кирпичная плита: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth": "Полированный блок: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_stairs": "Полированные ступеньки: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_slab": "Полированная плита: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_brick": "Полированные кирпичи: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Ступеньки из полированного кирпича: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Плита из полированного кирпича: Базальтовое стекло", + "block.mineralogy.basaltic_glass_wall": "Ограда: Базальтовое стекло", + "block.mineralogy.basaltic_glass_brick_wall": "Кирпичная ограда: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_wall": "Полированная ограда: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Ограда из полированного кирпича: Базальтовое стекло", + "block.mineralogy.basaltic_glass_furnace": "Печь: Базальтовое стекло", + "block.mineralogy.basaltic_glass_brick_furnace": "Кирпичная печь: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_furnace": "Полированная печь: Базальтовое стекло", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Печь из полированного кирпича: Базальтовое стекло", "block.mineralogy.scoria": "Скория", - "block.mineralogy.scoria_stairs": "Лестница Скории", - "block.mineralogy.scoria_slab": "Плита шлака", - "block.mineralogy.scoria_brick": "Кирпич Скория", - "block.mineralogy.scoria_brick_stairs": "Кирпичная лестница Скории", - "block.mineralogy.scoria_brick_slab": "Кирпичная плита из скория", - "block.mineralogy.scoria_smooth": "Полированный шлак", - "block.mineralogy.scoria_smooth_stairs": "Полированная лестница Scoria", - "block.mineralogy.scoria_smooth_slab": "Полированная плита из скория", - "block.mineralogy.scoria_smooth_brick": "Полированный кирпич со скорией", - "block.mineralogy.scoria_smooth_brick_stairs": "Лестница из полированного кирпича Scoria", - "block.mineralogy.scoria_smooth_brick_slab": "Плита из полированного кирпича со скорией", - "block.mineralogy.scoria_wall": "Стена Скории", - "block.mineralogy.scoria_brick_wall": "Кирпичная стена Скории", - "block.mineralogy.scoria_smooth_wall": "Полированная стена со скорией", - "block.mineralogy.scoria_smooth_brick_wall": "Полированная кирпичная стена со скорией", - "block.mineralogy.scoria_furnace": "Печь со шлаком", - "block.mineralogy.scoria_brick_furnace": "Кирпичная печь из скория", - "block.mineralogy.scoria_smooth_furnace": "Печь для полировки скория", - "block.mineralogy.scoria_smooth_brick_furnace": "Печь из полированного кирпича Scoria", + "block.mineralogy.scoria_stairs": "Ступеньки: Скория", + "block.mineralogy.scoria_slab": "Плита: Скория", + "block.mineralogy.scoria_brick": "Кирпичи: Скория", + "block.mineralogy.scoria_brick_stairs": "Кирпичные ступеньки: Скория", + "block.mineralogy.scoria_brick_slab": "Кирпичная плита: Скория", + "block.mineralogy.scoria_smooth": "Полированный блок: Скория", + "block.mineralogy.scoria_smooth_stairs": "Полированные ступеньки: Скория", + "block.mineralogy.scoria_smooth_slab": "Полированная плита: Скория", + "block.mineralogy.scoria_smooth_brick": "Полированные кирпичи: Скория", + "block.mineralogy.scoria_smooth_brick_stairs": "Ступеньки из полированного кирпича: Скория", + "block.mineralogy.scoria_smooth_brick_slab": "Плита из полированного кирпича: Скория", + "block.mineralogy.scoria_wall": "Ограда: Скория", + "block.mineralogy.scoria_brick_wall": "Кирпичная ограда: Скория", + "block.mineralogy.scoria_smooth_wall": "Полированная ограда: Скория", + "block.mineralogy.scoria_smooth_brick_wall": "Ограда из полированного кирпича: Скория", + "block.mineralogy.scoria_furnace": "Печь: Скория", + "block.mineralogy.scoria_brick_furnace": "Кирпичная печь: Скория", + "block.mineralogy.scoria_smooth_furnace": "Полированная печь: Скория", + "block.mineralogy.scoria_smooth_brick_furnace": "Печь из полированного кирпича: Скория", "block.mineralogy.tuff": "Туф", - "block.mineralogy.tuff_stairs": "Лестница из туфа", - "block.mineralogy.tuff_slab": "Туфовая плита", - "block.mineralogy.tuff_brick": "Туфовый кирпич", - "block.mineralogy.tuff_brick_stairs": "Лестница из туфового кирпича", - "block.mineralogy.tuff_brick_slab": "Плита из туфового кирпича", - "block.mineralogy.tuff_smooth": "Полированный туф", - "block.mineralogy.tuff_smooth_stairs": "Лестница из полированного туфа", - "block.mineralogy.tuff_smooth_slab": "Полированная плита из туфа", - "block.mineralogy.tuff_smooth_brick": "Полированный кирпич из туфа", - "block.mineralogy.tuff_smooth_brick_stairs": "Лестница из полированного кирпича туфа", - "block.mineralogy.tuff_smooth_brick_slab": "Плита из полированного кирпича из туфа", - "block.mineralogy.tuff_wall": "Стена из туфа", - "block.mineralogy.tuff_brick_wall": "Кирпичная стена из туфа", - "block.mineralogy.tuff_smooth_wall": "Полированная стена из туфа", - "block.mineralogy.tuff_smooth_brick_wall": "Кирпичная стена из полированного туфа", - "block.mineralogy.tuff_furnace": "Туфовая печь", - "block.mineralogy.tuff_brick_furnace": "Печь из туфового кирпича", - "block.mineralogy.tuff_smooth_furnace": "Печь для полировки туфа", - "block.mineralogy.tuff_smooth_brick_furnace": "Печь из полированного кирпича из туфа", + "block.mineralogy.tuff_stairs": "Ступеньки: Туф", + "block.mineralogy.tuff_slab": "Плита: Туф", + "block.mineralogy.tuff_brick": "Кирпичи: Туф", + "block.mineralogy.tuff_brick_stairs": "Кирпичные ступеньки: Туф", + "block.mineralogy.tuff_brick_slab": "Кирпичная плита: Туф", + "block.mineralogy.tuff_smooth": "Полированный блок: Туф", + "block.mineralogy.tuff_smooth_stairs": "Полированные ступеньки: Туф", + "block.mineralogy.tuff_smooth_slab": "Полированная плита: Туф", + "block.mineralogy.tuff_smooth_brick": "Полированные кирпичи: Туф", + "block.mineralogy.tuff_smooth_brick_stairs": "Ступеньки из полированного кирпича: Туф", + "block.mineralogy.tuff_smooth_brick_slab": "Плита из полированного кирпича: Туф", + "block.mineralogy.tuff_wall": "Ограда: Туф", + "block.mineralogy.tuff_brick_wall": "Кирпичная ограда: Туф", + "block.mineralogy.tuff_smooth_wall": "Полированная ограда: Туф", + "block.mineralogy.tuff_smooth_brick_wall": "Ограда из полированного кирпича: Туф", + "block.mineralogy.tuff_furnace": "Печь: Туф", + "block.mineralogy.tuff_brick_furnace": "Кирпичная печь: Туф", + "block.mineralogy.tuff_smooth_furnace": "Полированная печь: Туф", + "block.mineralogy.tuff_smooth_brick_furnace": "Печь из полированного кирпича: Туф", "block.mineralogy.siltstone": "Алевролит", - "block.mineralogy.siltstone_stairs": "Лестница из алевролита", - "block.mineralogy.siltstone_slab": "Плита из алевролита", - "block.mineralogy.siltstone_brick": "Кирпич из алевролита", - "block.mineralogy.siltstone_brick_stairs": "Лестница из алевролитового кирпича", - "block.mineralogy.siltstone_brick_slab": "Кирпичная плита из алевролита", - "block.mineralogy.siltstone_smooth": "Полированный алевролит", - "block.mineralogy.siltstone_smooth_stairs": "Полированная лестница из алевролита", - "block.mineralogy.siltstone_smooth_slab": "Полированная плита из алевролита", - "block.mineralogy.siltstone_smooth_brick": "Полированный кирпич из алевролита", - "block.mineralogy.siltstone_smooth_brick_stairs": "Лестница из полированного кирпича из алевролита", - "block.mineralogy.siltstone_smooth_brick_slab": "Плита из полированного кирпича из алевролита", - "block.mineralogy.siltstone_wall": "Стена из алевролита", - "block.mineralogy.siltstone_brick_wall": "Кирпичная стена из алевролита", - "block.mineralogy.siltstone_smooth_wall": "Полированная стена из алевролита", - "block.mineralogy.siltstone_smooth_brick_wall": "Стена из полированного алевролитового кирпича", - "block.mineralogy.siltstone_furnace": "Алевролитовая печь", - "block.mineralogy.siltstone_brick_furnace": "Кирпичная печь из алевролита", - "block.mineralogy.siltstone_smooth_furnace": "Печь для полировки алевролита", - "block.mineralogy.siltstone_smooth_brick_furnace": "Печь из полированного кирпича из алевролита", + "block.mineralogy.siltstone_stairs": "Ступеньки: Алевролит", + "block.mineralogy.siltstone_slab": "Плита: Алевролит", + "block.mineralogy.siltstone_brick": "Кирпичи: Алевролит", + "block.mineralogy.siltstone_brick_stairs": "Кирпичные ступеньки: Алевролит", + "block.mineralogy.siltstone_brick_slab": "Кирпичная плита: Алевролит", + "block.mineralogy.siltstone_smooth": "Полированный блок: Алевролит", + "block.mineralogy.siltstone_smooth_stairs": "Полированные ступеньки: Алевролит", + "block.mineralogy.siltstone_smooth_slab": "Полированная плита: Алевролит", + "block.mineralogy.siltstone_smooth_brick": "Полированные кирпичи: Алевролит", + "block.mineralogy.siltstone_smooth_brick_stairs": "Ступеньки из полированного кирпича: Алевролит", + "block.mineralogy.siltstone_smooth_brick_slab": "Плита из полированного кирпича: Алевролит", + "block.mineralogy.siltstone_wall": "Ограда: Алевролит", + "block.mineralogy.siltstone_brick_wall": "Кирпичная ограда: Алевролит", + "block.mineralogy.siltstone_smooth_wall": "Полированная ограда: Алевролит", + "block.mineralogy.siltstone_smooth_brick_wall": "Ограда из полированного кирпича: Алевролит", + "block.mineralogy.siltstone_furnace": "Печь: Алевролит", + "block.mineralogy.siltstone_brick_furnace": "Кирпичная печь: Алевролит", + "block.mineralogy.siltstone_smooth_furnace": "Полированная печь: Алевролит", + "block.mineralogy.siltstone_smooth_brick_furnace": "Печь из полированного кирпича: Алевролит", "block.mineralogy.rock_salt": "Каменная соль", - "block.mineralogy.rock_salt_stairs": "Лестница из каменной соли", - "block.mineralogy.rock_salt_slab": "Плита из каменной соли", - "block.mineralogy.rock_salt_brick": "Кирпич из каменной соли", - "block.mineralogy.rock_salt_brick_stairs": "Лестница из кирпича из каменной соли", - "block.mineralogy.rock_salt_brick_slab": "Кирпичная плита из каменной соли", - "block.mineralogy.rock_salt_smooth": "Полированная каменная соль", - "block.mineralogy.rock_salt_smooth_stairs": "Лестницы, полированные каменной солью", - "block.mineralogy.rock_salt_smooth_slab": "Полированная плита из каменной соли", - "block.mineralogy.rock_salt_smooth_brick": "Полированный кирпич из каменной соли", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Лестница из полированного кирпича с каменной солью", - "block.mineralogy.rock_salt_smooth_brick_slab": "Кирпичная плита, полированная каменной солью", - "block.mineralogy.rock_salt_wall": "Стена из каменной соли", - "block.mineralogy.rock_salt_brick_wall": "Кирпичная стена из каменной соли", - "block.mineralogy.rock_salt_smooth_wall": "Стена, полированная каменной солью", - "block.mineralogy.rock_salt_smooth_brick_wall": "Кирпичная стена, полированная каменной солью", - "block.mineralogy.rock_salt_furnace": "Печь из каменной соли", - "block.mineralogy.rock_salt_brick_furnace": "Кирпичная печь из каменной соли", - "block.mineralogy.rock_salt_smooth_furnace": "Печь для полировки каменной солью", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Печь из полированного кирпича с каменной солью", + "block.mineralogy.rock_salt_stairs": "Ступеньки: Каменная соль", + "block.mineralogy.rock_salt_slab": "Плита: Каменная соль", + "block.mineralogy.rock_salt_brick": "Кирпичи: Каменная соль", + "block.mineralogy.rock_salt_brick_stairs": "Кирпичные ступеньки: Каменная соль", + "block.mineralogy.rock_salt_brick_slab": "Кирпичная плита: Каменная соль", + "block.mineralogy.rock_salt_smooth": "Полированный блок: Каменная соль", + "block.mineralogy.rock_salt_smooth_stairs": "Полированные ступеньки: Каменная соль", + "block.mineralogy.rock_salt_smooth_slab": "Полированная плита: Каменная соль", + "block.mineralogy.rock_salt_smooth_brick": "Полированные кирпичи: Каменная соль", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Ступеньки из полированного кирпича: Каменная соль", + "block.mineralogy.rock_salt_smooth_brick_slab": "Плита из полированного кирпича: Каменная соль", + "block.mineralogy.rock_salt_wall": "Ограда: Каменная соль", + "block.mineralogy.rock_salt_brick_wall": "Кирпичная ограда: Каменная соль", + "block.mineralogy.rock_salt_smooth_wall": "Полированная ограда: Каменная соль", + "block.mineralogy.rock_salt_smooth_brick_wall": "Ограда из полированного кирпича: Каменная соль", + "block.mineralogy.rock_salt_furnace": "Печь: Каменная соль", + "block.mineralogy.rock_salt_brick_furnace": "Кирпичная печь: Каменная соль", + "block.mineralogy.rock_salt_smooth_furnace": "Полированная печь: Каменная соль", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Печь из полированного кирпича: Каменная соль", "block.mineralogy.hornfels": "Роговик", - "block.mineralogy.hornfels_stairs": "Лестница Хорфелса", - "block.mineralogy.hornfels_slab": "Плита роговика", - "block.mineralogy.hornfels_brick": "Роговой кирпич", - "block.mineralogy.hornfels_brick_stairs": "Кирпичная лестница Hornfels", - "block.mineralogy.hornfels_brick_slab": "Кирпичная плита Роговик", - "block.mineralogy.hornfels_smooth": "Полированный роговик", - "block.mineralogy.hornfels_smooth_stairs": "Полированная лестница Hornfels", - "block.mineralogy.hornfels_smooth_slab": "Полированная плита роговика", - "block.mineralogy.hornfels_smooth_brick": "Полированный кирпич Hornfels", - "block.mineralogy.hornfels_smooth_brick_stairs": "Лестница из полированного кирпича Hornfels", - "block.mineralogy.hornfels_smooth_brick_slab": "Плита из полированного кирпича Hornfels", - "block.mineralogy.hornfels_wall": "Стена Роговиков", - "block.mineralogy.hornfels_brick_wall": "Кирпичная стена Хорфелса", - "block.mineralogy.hornfels_smooth_wall": "Полированная стена Hornfels", - "block.mineralogy.hornfels_smooth_brick_wall": "Полированная кирпичная стена Hornfels", - "block.mineralogy.hornfels_furnace": "Печь роговика", - "block.mineralogy.hornfels_brick_furnace": "Кирпичная печь Хорнфельса", - "block.mineralogy.hornfels_smooth_furnace": "Печь для полировки роговика", - "block.mineralogy.hornfels_smooth_brick_furnace": "Печь из полированного кирпича Hornfels", + "block.mineralogy.hornfels_stairs": "Ступеньки: Роговик", + "block.mineralogy.hornfels_slab": "Плита: Роговик", + "block.mineralogy.hornfels_brick": "Кирпичи: Роговик", + "block.mineralogy.hornfels_brick_stairs": "Кирпичные ступеньки: Роговик", + "block.mineralogy.hornfels_brick_slab": "Кирпичная плита: Роговик", + "block.mineralogy.hornfels_smooth": "Полированный блок: Роговик", + "block.mineralogy.hornfels_smooth_stairs": "Полированные ступеньки: Роговик", + "block.mineralogy.hornfels_smooth_slab": "Полированная плита: Роговик", + "block.mineralogy.hornfels_smooth_brick": "Полированные кирпичи: Роговик", + "block.mineralogy.hornfels_smooth_brick_stairs": "Ступеньки из полированного кирпича: Роговик", + "block.mineralogy.hornfels_smooth_brick_slab": "Плита из полированного кирпича: Роговик", + "block.mineralogy.hornfels_wall": "Ограда: Роговик", + "block.mineralogy.hornfels_brick_wall": "Кирпичная ограда: Роговик", + "block.mineralogy.hornfels_smooth_wall": "Полированная ограда: Роговик", + "block.mineralogy.hornfels_smooth_brick_wall": "Ограда из полированного кирпича: Роговик", + "block.mineralogy.hornfels_furnace": "Печь: Роговик", + "block.mineralogy.hornfels_brick_furnace": "Кирпичная печь: Роговик", + "block.mineralogy.hornfels_smooth_furnace": "Полированная печь: Роговик", + "block.mineralogy.hornfels_smooth_brick_furnace": "Печь из полированного кирпича: Роговик", "block.mineralogy.quartzite": "Кварцит", - "block.mineralogy.quartzite_stairs": "Кварцитовая лестница", - "block.mineralogy.quartzite_slab": "Кварцитовая плита", - "block.mineralogy.quartzite_brick": "Кварцитовый кирпич", - "block.mineralogy.quartzite_brick_stairs": "Лестница из кварцитового кирпича", - "block.mineralogy.quartzite_brick_slab": "Плита из кварцитового кирпича", - "block.mineralogy.quartzite_smooth": "Полированный кварцит", - "block.mineralogy.quartzite_smooth_stairs": "Лестница из полированного кварцита", - "block.mineralogy.quartzite_smooth_slab": "Полированная плита из кварцита", - "block.mineralogy.quartzite_smooth_brick": "Кварцитовый полированный кирпич", - "block.mineralogy.quartzite_smooth_brick_stairs": "Лестница из полированного кварцитового кирпича", - "block.mineralogy.quartzite_smooth_brick_slab": "Плита из полированного кирпича из кварцита", - "block.mineralogy.quartzite_wall": "Кварцитовая стена", - "block.mineralogy.quartzite_brick_wall": "Кирпичная стена из кварцита", - "block.mineralogy.quartzite_smooth_wall": "Полированная стена из кварцита", - "block.mineralogy.quartzite_smooth_brick_wall": "Кирпичная стена из полированного кварцита", - "block.mineralogy.quartzite_furnace": "Кварцитовая печь", - "block.mineralogy.quartzite_brick_furnace": "Печь из кварцитового кирпича", - "block.mineralogy.quartzite_smooth_furnace": "Печь для полировки кварцита", - "block.mineralogy.quartzite_smooth_brick_furnace": "Печь из кварцитового полированного кирпича", + "block.mineralogy.quartzite_stairs": "Ступеньки: Кварцит", + "block.mineralogy.quartzite_slab": "Плита: Кварцит", + "block.mineralogy.quartzite_brick": "Кирпичи: Кварцит", + "block.mineralogy.quartzite_brick_stairs": "Кирпичные ступеньки: Кварцит", + "block.mineralogy.quartzite_brick_slab": "Кирпичная плита: Кварцит", + "block.mineralogy.quartzite_smooth": "Полированный блок: Кварцит", + "block.mineralogy.quartzite_smooth_stairs": "Полированные ступеньки: Кварцит", + "block.mineralogy.quartzite_smooth_slab": "Полированная плита: Кварцит", + "block.mineralogy.quartzite_smooth_brick": "Полированные кирпичи: Кварцит", + "block.mineralogy.quartzite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Кварцит", + "block.mineralogy.quartzite_smooth_brick_slab": "Плита из полированного кирпича: Кварцит", + "block.mineralogy.quartzite_wall": "Ограда: Кварцит", + "block.mineralogy.quartzite_brick_wall": "Кирпичная ограда: Кварцит", + "block.mineralogy.quartzite_smooth_wall": "Полированная ограда: Кварцит", + "block.mineralogy.quartzite_smooth_brick_wall": "Ограда из полированного кирпича: Кварцит", + "block.mineralogy.quartzite_furnace": "Печь: Кварцит", + "block.mineralogy.quartzite_brick_furnace": "Кирпичная печь: Кварцит", + "block.mineralogy.quartzite_smooth_furnace": "Полированная печь: Кварцит", + "block.mineralogy.quartzite_smooth_brick_furnace": "Печь из полированного кирпича: Кварцит", "block.mineralogy.novaculite": "Новакулит", - "block.mineralogy.novaculite_stairs": "Новакулитовая лестница", - "block.mineralogy.novaculite_slab": "Новакулитовая плита", - "block.mineralogy.novaculite_brick": "Новакулитовый кирпич", - "block.mineralogy.novaculite_brick_stairs": "Лестница из новокулитового кирпича", - "block.mineralogy.novaculite_brick_slab": "Плита из новокулитового кирпича", - "block.mineralogy.novaculite_smooth": "Полированный новокулит", - "block.mineralogy.novaculite_smooth_stairs": "Новакулитовая полированная лестница", - "block.mineralogy.novaculite_smooth_slab": "Полированная плита из новокулита", - "block.mineralogy.novaculite_smooth_brick": "Новакулитовый полированный кирпич", - "block.mineralogy.novaculite_smooth_brick_stairs": "Лестница из полированного новокулитового кирпича", - "block.mineralogy.novaculite_smooth_brick_slab": "Плита из полированного кирпича из новокулита", - "block.mineralogy.novaculite_wall": "Новокулитовая стена", - "block.mineralogy.novaculite_brick_wall": "Стена из новокулитового кирпича", - "block.mineralogy.novaculite_smooth_wall": "Полированная стена из новокулита", - "block.mineralogy.novaculite_smooth_brick_wall": "Новокулитовая полированная кирпичная стена", - "block.mineralogy.novaculite_furnace": "Новокулитовая печь", - "block.mineralogy.novaculite_brick_furnace": "Печь из новокулитового кирпича", - "block.mineralogy.novaculite_smooth_furnace": "Печь для полировки новокулита", - "block.mineralogy.novaculite_smooth_brick_furnace": "Печь из новокулитового полированного кирпича", + "block.mineralogy.novaculite_stairs": "Ступеньки: Новакулит", + "block.mineralogy.novaculite_slab": "Плита: Новакулит", + "block.mineralogy.novaculite_brick": "Кирпичи: Новакулит", + "block.mineralogy.novaculite_brick_stairs": "Кирпичные ступеньки: Новакулит", + "block.mineralogy.novaculite_brick_slab": "Кирпичная плита: Новакулит", + "block.mineralogy.novaculite_smooth": "Полированный блок: Новакулит", + "block.mineralogy.novaculite_smooth_stairs": "Полированные ступеньки: Новакулит", + "block.mineralogy.novaculite_smooth_slab": "Полированная плита: Новакулит", + "block.mineralogy.novaculite_smooth_brick": "Полированные кирпичи: Новакулит", + "block.mineralogy.novaculite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Новакулит", + "block.mineralogy.novaculite_smooth_brick_slab": "Плита из полированного кирпича: Новакулит", + "block.mineralogy.novaculite_wall": "Ограда: Новакулит", + "block.mineralogy.novaculite_brick_wall": "Кирпичная ограда: Новакулит", + "block.mineralogy.novaculite_smooth_wall": "Полированная ограда: Новакулит", + "block.mineralogy.novaculite_smooth_brick_wall": "Ограда из полированного кирпича: Новакулит", + "block.mineralogy.novaculite_furnace": "Печь: Новакулит", + "block.mineralogy.novaculite_brick_furnace": "Кирпичная печь: Новакулит", + "block.mineralogy.novaculite_smooth_furnace": "Полированная печь: Новакулит", + "block.mineralogy.novaculite_smooth_brick_furnace": "Печь из полированного кирпича: Новакулит", "block.mineralogy.chalk": "Мел", "item.mineralogy.chalk_dust": "Меловой порошок", "item.mineralogy.salt_dust": "Соль", "item.mineralogy.rock_salt_dust": "Кристаллы каменной соли", "block.mineralogy.rocksaltlamp": "Лампа из каменной соли", "block.mineralogy.rocksaltstreetlamp": "Уличный фонарь из каменной соли", - "block.mineralogy.andesite_relief_axe": "Рельеф из андезитового топора", - "block.mineralogy.andesite_relief_blank": "Андезитовый пустой рельеф", - "block.mineralogy.andesite_relief_cross": "Рельеф с андезитовым крестом", - "block.mineralogy.andesite_relief_hammer": "Рельеф из андезитового молота", - "block.mineralogy.andesite_relief_hoe": "Андезитовый рельеф мотыги", - "block.mineralogy.andesite_relief_horizontal": "Андезитовый горизонтальный рельеф", - "block.mineralogy.andesite_relief_i": "Андезит I Рельеф", - "block.mineralogy.andesite_relief_left": "Андезитовый левый рельеф", - "block.mineralogy.andesite_relief_pickaxe": "Рельеф с андезитовой киркой", - "block.mineralogy.andesite_relief_plus": "Андезит Плюс Релиф", - "block.mineralogy.andesite_relief_right": "Андезитовый правый рельеф", - "block.mineralogy.andesite_relief_sword": "Рельеф с андезитовым мечом", - "block.mineralogy.andesite_relief_vertical": "Андезитовый вертикальный рельеф", - "block.mineralogy.basalt_relief_axe": "Рельеф из базальтового топора", - "block.mineralogy.basalt_relief_blank": "Базальтовый пустой рельеф", - "block.mineralogy.basalt_relief_cross": "Базальтовый крестовый рельеф", - "block.mineralogy.basalt_relief_hammer": "Рельеф из базальтового молота", - "block.mineralogy.basalt_relief_hoe": "Рельеф из базальтовой мотыги", - "block.mineralogy.basalt_relief_horizontal": "Базальтовый горизонтальный рельеф", - "block.mineralogy.basalt_relief_i": "Базальт I Рельеф", - "block.mineralogy.basalt_relief_left": "Базальтовый левый рельеф", - "block.mineralogy.basalt_relief_pickaxe": "Рельеф с базальтовой киркой", - "block.mineralogy.basalt_relief_plus": "Базальт Плюс Релиф", - "block.mineralogy.basalt_relief_right": "Рельеф «Базальтовое право»", - "block.mineralogy.basalt_relief_sword": "Рельеф с базальтовым мечом", - "block.mineralogy.basalt_relief_vertical": "Базальтовый вертикальный рельеф", - "block.mineralogy.diorite_relief_axe": "Рельеф для топора из диорита", - "block.mineralogy.diorite_relief_blank": "Диорит Бланк Рельеф", - "block.mineralogy.diorite_relief_cross": "Рельеф с крестом из диорита", - "block.mineralogy.diorite_relief_hammer": "Рельеф из диорита «Молот»", - "block.mineralogy.diorite_relief_hoe": "Диорит Мотыга Рельеф", - "block.mineralogy.diorite_relief_horizontal": "Диорит Горизонтальный рельеф", - "block.mineralogy.diorite_relief_i": "Диорит I Рельеф", - "block.mineralogy.diorite_relief_left": "Диоритовый левый рельеф", - "block.mineralogy.diorite_relief_pickaxe": "Рельеф для кирки из диорита", - "block.mineralogy.diorite_relief_plus": "Диорит Плюс Релиф", - "block.mineralogy.diorite_relief_right": "Диоритовый правый рельеф", - "block.mineralogy.diorite_relief_sword": "Рельеф меча из диорита", - "block.mineralogy.diorite_relief_vertical": "Диорит Вертикальный рельеф", - "block.mineralogy.granite_relief_axe": "Рельеф с гранитным топором", - "block.mineralogy.granite_relief_blank": "Гранитный пустой рельеф", - "block.mineralogy.granite_relief_cross": "Рельеф из гранитного креста", - "block.mineralogy.granite_relief_hammer": "Рельеф с гранитным молотом", - "block.mineralogy.granite_relief_hoe": "Рельеф из гранитной мотыги", - "block.mineralogy.granite_relief_horizontal": "Гранитный горизонтальный рельеф", - "block.mineralogy.granite_relief_i": "Гранит I Рельеф", - "block.mineralogy.granite_relief_left": "Гранитный левый рельеф", - "block.mineralogy.granite_relief_pickaxe": "Рельеф с гранитной киркой", - "block.mineralogy.granite_relief_plus": "Гранит Плюс Релиф", - "block.mineralogy.granite_relief_right": "Гранитный правый рельеф", - "block.mineralogy.granite_relief_sword": "Рельеф с гранитным мечом", - "block.mineralogy.granite_relief_vertical": "Гранитный вертикальный рельеф", - "block.mineralogy.rhyolite_relief_axe": "Рельеф для топора из риолита", - "block.mineralogy.rhyolite_relief_blank": "Риолитовый бланковый рельеф", - "block.mineralogy.rhyolite_relief_cross": "Рельеф с риолитовым крестом", - "block.mineralogy.rhyolite_relief_hammer": "Риолитовый молоток Рельеф", - "block.mineralogy.rhyolite_relief_hoe": "Рельеф для мотыги из риолита", - "block.mineralogy.rhyolite_relief_horizontal": "Риолит Горизонтальный рельеф", - "block.mineralogy.rhyolite_relief_i": "Риолит I Рельеф", - "block.mineralogy.rhyolite_relief_left": "Риолитовый левый рельеф", - "block.mineralogy.rhyolite_relief_pickaxe": "Риолитовая кирка Рельеф", - "block.mineralogy.rhyolite_relief_plus": "Риолит Плюс Релиф", - "block.mineralogy.rhyolite_relief_right": "Риолитовый правый рельеф", - "block.mineralogy.rhyolite_relief_sword": "Рельеф меча из риолита", - "block.mineralogy.rhyolite_relief_vertical": "Риолит Вертикальный рельеф", - "block.mineralogy.pegmatite_relief_axe": "Рельеф из пегматитового топора", - "block.mineralogy.pegmatite_relief_blank": "Пегматитовый пустой рельеф", - "block.mineralogy.pegmatite_relief_cross": "Пегматитовый крестовый рельеф", - "block.mineralogy.pegmatite_relief_hammer": "Рельеф из пегматитового молота", - "block.mineralogy.pegmatite_relief_hoe": "Пегматитовый рельеф мотыги", - "block.mineralogy.pegmatite_relief_horizontal": "Пегматитовый горизонтальный рельеф", - "block.mineralogy.pegmatite_relief_i": "Пегматит I Рельеф", - "block.mineralogy.pegmatite_relief_left": "Пегматитовый левый рельеф", - "block.mineralogy.pegmatite_relief_pickaxe": "Рельеф с пегматитовой киркой", - "block.mineralogy.pegmatite_relief_plus": "Пегматит Плюс Релиф", - "block.mineralogy.pegmatite_relief_right": "Пегматитовый правый рельеф", - "block.mineralogy.pegmatite_relief_sword": "Рельеф с пегматитовым мечом", - "block.mineralogy.pegmatite_relief_vertical": "Пегматитовый вертикальный рельеф", - "block.mineralogy.shale_relief_axe": "Рельеф из сланцевого топора", - "block.mineralogy.shale_relief_blank": "Сланцевый пустой рельеф", - "block.mineralogy.shale_relief_cross": "Рельеф Сланцевого креста", - "block.mineralogy.shale_relief_hammer": "Рельеф Сланцевого молота", - "block.mineralogy.shale_relief_hoe": "Рельеф сланцевой мотыги", - "block.mineralogy.shale_relief_horizontal": "Сланцевый горизонтальный рельеф", - "block.mineralogy.shale_relief_i": "Рельеф Сланцев I", - "block.mineralogy.shale_relief_left": "Рельеф сланцевого остатка", - "block.mineralogy.shale_relief_pickaxe": "Рельеф сланцевой кирки", - "block.mineralogy.shale_relief_plus": "Сланец плюс помощь", - "block.mineralogy.shale_relief_right": "Облегчение сланцевых прав", - "block.mineralogy.shale_relief_sword": "Рельеф сланцевого меча", - "block.mineralogy.shale_relief_vertical": "Сланцевый вертикальный рельеф", - "block.mineralogy.conglomerate_relief_axe": "Рельеф топора Конгломерата", - "block.mineralogy.conglomerate_relief_blank": "Пустой рельеф конгломерата", - "block.mineralogy.conglomerate_relief_cross": "Рельеф с крестом из конгломерата", - "block.mineralogy.conglomerate_relief_hammer": "Рельеф молота конгломерата", - "block.mineralogy.conglomerate_relief_hoe": "Рельеф мотыги конгломерата", - "block.mineralogy.conglomerate_relief_horizontal": "Конгломерат Горизонтальный Рельеф", - "block.mineralogy.conglomerate_relief_i": "Конгломерат I. Облегчение", - "block.mineralogy.conglomerate_relief_left": "Конгломерат Левый Рельеф", - "block.mineralogy.conglomerate_relief_pickaxe": "Рельеф с киркой конгломерата", - "block.mineralogy.conglomerate_relief_plus": "Конгломерат плюс помощь", - "block.mineralogy.conglomerate_relief_right": "Помощь правым конгломератам", - "block.mineralogy.conglomerate_relief_sword": "Рельеф с мечом конгломерата", - "block.mineralogy.conglomerate_relief_vertical": "Конгломерат Вертикальный рельеф", - "block.mineralogy.dolomite_relief_axe": "Рельеф с доломитовым топором", - "block.mineralogy.dolomite_relief_blank": "Доломитовый пустой рельеф", - "block.mineralogy.dolomite_relief_cross": "Рельеф Доломитового Креста", - "block.mineralogy.dolomite_relief_hammer": "Рельеф Доломитового Молота", - "block.mineralogy.dolomite_relief_hoe": "Доломитовый рельеф Мотыги", - "block.mineralogy.dolomite_relief_horizontal": "Доломитовый горизонтальный рельеф", - "block.mineralogy.dolomite_relief_i": "Доломит I Рельеф", - "block.mineralogy.dolomite_relief_left": "Доломитовый левый рельеф", - "block.mineralogy.dolomite_relief_pickaxe": "Рельеф с доломитовой киркой", - "block.mineralogy.dolomite_relief_plus": "Доломит Плюс Релиф", - "block.mineralogy.dolomite_relief_right": "Доломитовый правый рельеф", - "block.mineralogy.dolomite_relief_sword": "Рельеф с мечом из доломита", - "block.mineralogy.dolomite_relief_vertical": "Доломитовый вертикальный рельеф", - "block.mineralogy.limestone_relief_axe": "Рельеф с топором из известняка", - "block.mineralogy.limestone_relief_blank": "Пустой рельеф из известняка", - "block.mineralogy.limestone_relief_cross": "Рельеф с крестом из известняка", - "block.mineralogy.limestone_relief_hammer": "Рельеф с известняковым молотом", - "block.mineralogy.limestone_relief_hoe": "Рельеф из известняковой мотыги", - "block.mineralogy.limestone_relief_horizontal": "Горизонтальный рельеф известняка", - "block.mineralogy.limestone_relief_i": "Известняк I Рельеф", - "block.mineralogy.limestone_relief_left": "Левый рельеф известняка", - "block.mineralogy.limestone_relief_pickaxe": "Рельеф с известняковой киркой", - "block.mineralogy.limestone_relief_plus": "Известняк плюс облегчение", - "block.mineralogy.limestone_relief_right": "Известняковый правый рельеф", - "block.mineralogy.limestone_relief_sword": "Рельеф с мечом из известняка", - "block.mineralogy.limestone_relief_vertical": "Известняковый вертикальный рельеф", - "block.mineralogy.marble_relief_axe": "Рельеф с мраморным топором", - "block.mineralogy.marble_relief_blank": "Мраморный пустой рельеф", - "block.mineralogy.marble_relief_cross": "Мраморный крест-рельеф", - "block.mineralogy.marble_relief_hammer": "Рельеф с мраморным молотом", - "block.mineralogy.marble_relief_hoe": "Рельеф из мраморной мотыги", - "block.mineralogy.marble_relief_horizontal": "Мраморный горизонтальный рельеф", - "block.mineralogy.marble_relief_i": "Мрамор I Рельеф", - "block.mineralogy.marble_relief_left": "Мраморный рельеф слева", - "block.mineralogy.marble_relief_pickaxe": "Рельеф с мраморной киркой", - "block.mineralogy.marble_relief_plus": "Мрамор плюс рельеф", - "block.mineralogy.marble_relief_right": "Мраморный правый рельеф", - "block.mineralogy.marble_relief_sword": "Рельеф с мраморным мечом", - "block.mineralogy.marble_relief_vertical": "Мраморный вертикальный рельеф", - "block.mineralogy.slate_relief_axe": "Рельеф для сланцевого топора", - "block.mineralogy.slate_relief_blank": "Рельеф из сланца", - "block.mineralogy.slate_relief_cross": "Рельеф из сланцевого креста", - "block.mineralogy.slate_relief_hammer": "Рельеф для сланцевого молота", - "block.mineralogy.slate_relief_hoe": "Рельеф для шиферной мотыги", - "block.mineralogy.slate_relief_horizontal": "Горизонтальный рельеф сланца", - "block.mineralogy.slate_relief_i": "Сланец I Рельеф", - "block.mineralogy.slate_relief_left": "Рельеф слева", - "block.mineralogy.slate_relief_pickaxe": "Рельеф от сланцевой кирки", - "block.mineralogy.slate_relief_plus": "Slate Plus Relief", - "block.mineralogy.slate_relief_right": "Правый рельеф шифера", - "block.mineralogy.slate_relief_sword": "Рельеф сланцевого меча", - "block.mineralogy.slate_relief_vertical": "Сланцевый вертикальный рельеф", - "block.mineralogy.schist_relief_axe": "Рельеф сланцевого топора", - "block.mineralogy.schist_relief_blank": "Сланцевый пустой рельеф", - "block.mineralogy.schist_relief_cross": "Рельеф Сланцевого Креста", - "block.mineralogy.schist_relief_hammer": "Рельеф сланцевого молота", - "block.mineralogy.schist_relief_hoe": "Рельеф сланцевой мотыги", - "block.mineralogy.schist_relief_horizontal": "Горизонтальный рельеф сланцев", - "block.mineralogy.schist_relief_i": "Сланец I Рельеф", - "block.mineralogy.schist_relief_left": "Сланцевый левый рельеф", - "block.mineralogy.schist_relief_pickaxe": "Рельеф сланцевой кирки", - "block.mineralogy.schist_relief_plus": "Сланец Плюс Релиф", - "block.mineralogy.schist_relief_right": "Сланцевый правый рельеф", - "block.mineralogy.schist_relief_sword": "Рельеф сланцевого меча", - "block.mineralogy.schist_relief_vertical": "Сланцевый вертикальный рельеф", - "block.mineralogy.gneiss_relief_axe": "Рельеф с топором из гнейса", - "block.mineralogy.gneiss_relief_blank": "Гнейсовый пустой рельеф", - "block.mineralogy.gneiss_relief_cross": "Рельеф «Гнейсовый крест»", - "block.mineralogy.gneiss_relief_hammer": "Рельеф «Гнейсовый молот»", - "block.mineralogy.gneiss_relief_hoe": "Гнейс Мотыга Рельеф", - "block.mineralogy.gneiss_relief_horizontal": "Гнейсовый горизонтальный рельеф", - "block.mineralogy.gneiss_relief_i": "Гнейс I Рельеф", - "block.mineralogy.gneiss_relief_left": "Гнейсовый левый рельеф", - "block.mineralogy.gneiss_relief_pickaxe": "Рельеф с гнейсовой киркой", - "block.mineralogy.gneiss_relief_plus": "Гнейс Плюс Релиф", - "block.mineralogy.gneiss_relief_right": "Правый рельеф Гнейса", - "block.mineralogy.gneiss_relief_sword": "Рельеф с гнейсовым мечом", - "block.mineralogy.gneiss_relief_vertical": "Гнейсовый вертикальный рельеф", - "block.mineralogy.phyllite_relief_axe": "Рельеф для топора из филлита", - "block.mineralogy.phyllite_relief_blank": "Филлитовый бланковый рельеф", - "block.mineralogy.phyllite_relief_cross": "Рельеф с филлитовым крестом", - "block.mineralogy.phyllite_relief_hammer": "Рельеф из филлитового молота", - "block.mineralogy.phyllite_relief_hoe": "Рельеф для мотыги из филлита", - "block.mineralogy.phyllite_relief_horizontal": "Филлит Горизонтальный рельеф", - "block.mineralogy.phyllite_relief_i": "Филлит I Рельеф", - "block.mineralogy.phyllite_relief_left": "Филлит левый рельеф", - "block.mineralogy.phyllite_relief_pickaxe": "Рельеф с киркой из филлита", - "block.mineralogy.phyllite_relief_plus": "Филлит Плюс Релиф", - "block.mineralogy.phyllite_relief_right": "Филлит Правый Рельеф", - "block.mineralogy.phyllite_relief_sword": "Рельеф с мечом из филлита", - "block.mineralogy.phyllite_relief_vertical": "Филлит Вертикальный рельеф", - "block.mineralogy.amphibolite_relief_axe": "Рельеф для топора из амфиболита", - "block.mineralogy.amphibolite_relief_blank": "Амфиболитовый бланковый рельеф", - "block.mineralogy.amphibolite_relief_cross": "Амфиболитовый крестовый рельеф", - "block.mineralogy.amphibolite_relief_hammer": "Амфиболитовый молоток Рельеф", - "block.mineralogy.amphibolite_relief_hoe": "Амфиболитовый рельеф мотыги", - "block.mineralogy.amphibolite_relief_horizontal": "Амфиболитовый горизонтальный рельеф", - "block.mineralogy.amphibolite_relief_i": "Амфиболит I Рельеф", - "block.mineralogy.amphibolite_relief_left": "Амфиболитовый левый рельеф", - "block.mineralogy.amphibolite_relief_pickaxe": "Рельеф с амфиболитовой киркой", - "block.mineralogy.amphibolite_relief_plus": "Амфиболит Плюс Релиф", - "block.mineralogy.amphibolite_relief_right": "Амфиболитовый правый рельеф", - "block.mineralogy.amphibolite_relief_sword": "Рельеф с мечом из амфиболита", - "block.mineralogy.amphibolite_relief_vertical": "Амфиболитовый вертикальный рельеф", - "block.mineralogy.diabase_relief_axe": "Рельеф для топора из диабаза", - "block.mineralogy.diabase_relief_blank": "Рельеф из диабаза", - "block.mineralogy.diabase_relief_cross": "Диабазовый крест-рельеф", - "block.mineralogy.diabase_relief_hammer": "Рельеф от диабазового молотка", - "block.mineralogy.diabase_relief_hoe": "Диабазовая мотыга", - "block.mineralogy.diabase_relief_horizontal": "Диабазовый горизонтальный рельеф", - "block.mineralogy.diabase_relief_i": "Диабаз I Рельеф", - "block.mineralogy.diabase_relief_left": "Рельеф левой диабаза", - "block.mineralogy.diabase_relief_pickaxe": "Рельеф от диабазовой кирки", - "block.mineralogy.diabase_relief_plus": "Диабаз Плюс Релиф", - "block.mineralogy.diabase_relief_right": "Рельеф правого диабаза", - "block.mineralogy.diabase_relief_sword": "Рельеф меча из диабаза", - "block.mineralogy.diabase_relief_vertical": "Вертикальный рельеф из диабаза", - "block.mineralogy.gabbro_relief_axe": "Рельеф топора габбро", - "block.mineralogy.gabbro_relief_blank": "Габбро Бланк Рельеф", - "block.mineralogy.gabbro_relief_cross": "Крест Габбро Рельеф", - "block.mineralogy.gabbro_relief_hammer": "Рельеф «Молот Габбро»", - "block.mineralogy.gabbro_relief_hoe": "Габбро Мотыга Рельеф", - "block.mineralogy.gabbro_relief_horizontal": "Габбро Горизонтальный рельеф", - "block.mineralogy.gabbro_relief_i": "Габбро I Рельеф", - "block.mineralogy.gabbro_relief_left": "Габбро левый рельеф", - "block.mineralogy.gabbro_relief_pickaxe": "Рельеф кирки Габбро", - "block.mineralogy.gabbro_relief_plus": "Габбро Плюс Релиф", - "block.mineralogy.gabbro_relief_right": "Габбро Правый Рельеф", - "block.mineralogy.gabbro_relief_sword": "Рельеф с мечом габбро", - "block.mineralogy.gabbro_relief_vertical": "Габбро Вертикальный рельеф", - "block.mineralogy.peridotite_relief_axe": "Рельеф с топором из перидотита", - "block.mineralogy.peridotite_relief_blank": "Перидотитовый пустой рельеф", - "block.mineralogy.peridotite_relief_cross": "Перидотитовый крестовый рельеф", - "block.mineralogy.peridotite_relief_hammer": "Рельеф из перидотитового молота", - "block.mineralogy.peridotite_relief_hoe": "Перидотитовый рельеф мотыги", - "block.mineralogy.peridotite_relief_horizontal": "Перидотитовый горизонтальный рельеф", - "block.mineralogy.peridotite_relief_i": "Перидотит I Рельеф", - "block.mineralogy.peridotite_relief_left": "Перидотитовый левый рельеф", - "block.mineralogy.peridotite_relief_pickaxe": "Рельеф с перидотитовой киркой", - "block.mineralogy.peridotite_relief_plus": "Перидотит Плюс Релиф", - "block.mineralogy.peridotite_relief_right": "Перидотитовый правый рельеф", - "block.mineralogy.peridotite_relief_sword": "Рельеф из перидотитового меча", - "block.mineralogy.peridotite_relief_vertical": "Перидотитовый вертикальный рельеф", - "block.mineralogy.basaltic_glass_relief_axe": "Рельеф с топором из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_blank": "Пустой рельеф из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_cross": "Крест из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_hammer": "Рельеф с молотом из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_hoe": "Рельеф мотыги из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_horizontal": "Горизонтальный рельеф из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_i": "Базальтовое стекло I Рельеф", - "block.mineralogy.basaltic_glass_relief_left": "Рельеф слева из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Рельеф кирки из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_plus": "Базальтовое стекло плюс рельеф", - "block.mineralogy.basaltic_glass_relief_right": "Рельеф справа из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_sword": "Рельеф с мечом из базальтового стекла", - "block.mineralogy.basaltic_glass_relief_vertical": "Вертикальный рельеф из базальтового стекла", - "block.mineralogy.scoria_relief_axe": "Рельеф топора скории", - "block.mineralogy.scoria_relief_blank": "Пустой рельеф Скории", - "block.mineralogy.scoria_relief_cross": "Рельеф Креста Скории", - "block.mineralogy.scoria_relief_hammer": "Рельеф Молота Скории", - "block.mineralogy.scoria_relief_hoe": "Рельеф для мотыги Scoria", - "block.mineralogy.scoria_relief_horizontal": "Горизонтальный рельеф Скория", - "block.mineralogy.scoria_relief_i": "Скория I Рельеф", - "block.mineralogy.scoria_relief_left": "Скория левый релиф", - "block.mineralogy.scoria_relief_pickaxe": "Рельеф кирки Скории", - "block.mineralogy.scoria_relief_plus": "Скория Плюс Релиф", - "block.mineralogy.scoria_relief_right": "Правый релиф Скории", - "block.mineralogy.scoria_relief_sword": "Рельеф Меча Скории", - "block.mineralogy.scoria_relief_vertical": "Вертикальный рельеф Скория", - "block.mineralogy.tuff_relief_axe": "Рельеф от туфового топора", - "block.mineralogy.tuff_relief_blank": "Рельеф из туфа", - "block.mineralogy.tuff_relief_cross": "Туфовый крестовый рельеф", - "block.mineralogy.tuff_relief_hammer": "Рельеф Туфового Молота", - "block.mineralogy.tuff_relief_hoe": "Рельеф для туфовой мотыги", - "block.mineralogy.tuff_relief_horizontal": "Туф Горизонтальный рельеф", - "block.mineralogy.tuff_relief_i": "Туф I Рельеф", - "block.mineralogy.tuff_relief_left": "Туфовый левый рельеф", - "block.mineralogy.tuff_relief_pickaxe": "Рельеф от кирки из туфа", - "block.mineralogy.tuff_relief_plus": "Туф Плюс Релиф", - "block.mineralogy.tuff_relief_right": "Рельеф правого туфа", - "block.mineralogy.tuff_relief_sword": "Рельеф меча из туфа", - "block.mineralogy.tuff_relief_vertical": "Туф Вертикальный рельеф", - "block.mineralogy.siltstone_relief_axe": "Рельеф топора из алевролитового камня", - "block.mineralogy.siltstone_relief_blank": "Пустой рельеф из алевролитов", - "block.mineralogy.siltstone_relief_cross": "Рельеф с алевролитовым крестом", - "block.mineralogy.siltstone_relief_hammer": "Рельеф с алевролитовым молотом", - "block.mineralogy.siltstone_relief_hoe": "Рельеф алевролитовой мотыги", - "block.mineralogy.siltstone_relief_horizontal": "Алевролитовый горизонтальный рельеф", - "block.mineralogy.siltstone_relief_i": "Алевролит I Рельеф", - "block.mineralogy.siltstone_relief_left": "Алевролитовый левый рельеф", - "block.mineralogy.siltstone_relief_pickaxe": "Рельеф с киркой из алевролита", - "block.mineralogy.siltstone_relief_plus": "Алевролит Плюс Релиф", - "block.mineralogy.siltstone_relief_right": "Алевролитовый правый рельеф", - "block.mineralogy.siltstone_relief_sword": "Рельеф с мечом из алевролита", - "block.mineralogy.siltstone_relief_vertical": "Алевролитовый вертикальный рельеф", - "block.mineralogy.rock_salt_relief_axe": "Рельеф топора из каменной соли", - "block.mineralogy.rock_salt_relief_blank": "Пустой рельеф из каменной соли", - "block.mineralogy.rock_salt_relief_cross": "Рельеф Креста из каменной соли", - "block.mineralogy.rock_salt_relief_hammer": "Рельеф от молота из каменной соли", - "block.mineralogy.rock_salt_relief_hoe": "Мотыга из каменной соли", - "block.mineralogy.rock_salt_relief_horizontal": "Каменная соль Горизонтальный рельеф", - "block.mineralogy.rock_salt_relief_i": "Каменная соль I Рельеф", - "block.mineralogy.rock_salt_relief_left": "Каменная соль, рельеф слева", - "block.mineralogy.rock_salt_relief_pickaxe": "Рельеф от кирки из каменной соли", - "block.mineralogy.rock_salt_relief_plus": "Каменная соль плюс облегчение", - "block.mineralogy.rock_salt_relief_right": "Помощь для прав на каменную соль", - "block.mineralogy.rock_salt_relief_sword": "Рельеф с мечом из каменной соли", - "block.mineralogy.rock_salt_relief_vertical": "Каменная соль Вертикальный рельеф", - "block.mineralogy.hornfels_relief_axe": "Рельеф для топора Hornfels", - "block.mineralogy.hornfels_relief_blank": "Пустой рельеф Hornfels", - "block.mineralogy.hornfels_relief_cross": "Рельеф с крестом Роговиков", - "block.mineralogy.hornfels_relief_hammer": "Рельеф для молота Хорнфельса", - "block.mineralogy.hornfels_relief_hoe": "Облегчение мотыги Hornfels", - "block.mineralogy.hornfels_relief_horizontal": "Роговик Горизонтальный рельеф", - "block.mineralogy.hornfels_relief_i": "Роговик I Облегчение", - "block.mineralogy.hornfels_relief_left": "Хорнфелс Левый Рельеф", - "block.mineralogy.hornfels_relief_pickaxe": "Рельеф от кирки Hornfels", - "block.mineralogy.hornfels_relief_plus": "Роговик плюс облегчение", - "block.mineralogy.hornfels_relief_right": "Правый рельеф Хорнфелса", - "block.mineralogy.hornfels_relief_sword": "Рельеф меча Хорнфелса", - "block.mineralogy.hornfels_relief_vertical": "Роговик Вертикальный рельеф", - "block.mineralogy.quartzite_relief_axe": "Рельеф для топора из кварцита", - "block.mineralogy.quartzite_relief_blank": "Кварцитовый бланковый рельеф", - "block.mineralogy.quartzite_relief_cross": "Кварцитовый крестовый рельеф", - "block.mineralogy.quartzite_relief_hammer": "Рельеф с кварцитовым молотком", - "block.mineralogy.quartzite_relief_hoe": "Рельеф для мотыги из кварцита", - "block.mineralogy.quartzite_relief_horizontal": "Кварцит Горизонтальный рельеф", - "block.mineralogy.quartzite_relief_i": "Кварцит I Рельеф", - "block.mineralogy.quartzite_relief_left": "Кварцитовый левый рельеф", - "block.mineralogy.quartzite_relief_pickaxe": "Рельеф для кирки из кварцита", - "block.mineralogy.quartzite_relief_plus": "Кварцит Плюс Релиф", - "block.mineralogy.quartzite_relief_right": "Кварцит Правый Рельеф", - "block.mineralogy.quartzite_relief_sword": "Рельеф меча из кварцита", - "block.mineralogy.quartzite_relief_vertical": "Кварцит Вертикальный рельеф", - "block.mineralogy.novaculite_relief_axe": "Рельеф для топора из новокулита", - "block.mineralogy.novaculite_relief_blank": "Новакулитовый пустой рельеф", - "block.mineralogy.novaculite_relief_cross": "Новакулитовый крестовый рельеф", - "block.mineralogy.novaculite_relief_hammer": "Рельеф из новокулитового молота", - "block.mineralogy.novaculite_relief_hoe": "Новакулитовая мотыга", - "block.mineralogy.novaculite_relief_horizontal": "Новокулитовый горизонтальный рельеф", - "block.mineralogy.novaculite_relief_i": "Новакулит I Рельеф", - "block.mineralogy.novaculite_relief_left": "Новокулитовый левый рельеф", - "block.mineralogy.novaculite_relief_pickaxe": "Рельеф из новокулитовой кирки", - "block.mineralogy.novaculite_relief_plus": "Новакулит Плюс Релиф", - "block.mineralogy.novaculite_relief_right": "Новакулит Правый Рельеф", - "block.mineralogy.novaculite_relief_sword": "Рельеф из новокулитового меча", - "block.mineralogy.novaculite_relief_vertical": "Новакулитовый вертикальный рельеф", - "advancements.mineralogy.all_the_rocks.title": "Назовите камни Людо!", - "advancements.mineralogy.all_the_rocks.description": "Ух ты, вы нашли все стандартные типы горных пород в минералогии!", - "fluid.mineralogy.crude_oil": "Сырая нефть", - "block.mineralogy.crude_oil": "Сырая нефть", - "item.mineralogy.crude_oil_bucket": "Ведро сырой нефти", + "block.mineralogy.andesite_relief_axe": "Барельеф: Андезит (топор)", + "block.mineralogy.andesite_relief_blank": "Барельеф: Андезит (без узора)", + "block.mineralogy.andesite_relief_cross": "Барельеф: Андезит (крест)", + "block.mineralogy.andesite_relief_hammer": "Барельеф: Андезит (молот)", + "block.mineralogy.andesite_relief_hoe": "Барельеф: Андезит (мотыга)", + "block.mineralogy.andesite_relief_horizontal": "Барельеф: Андезит (горизонтальный узор)", + "block.mineralogy.andesite_relief_i": "Барельеф: Андезит (I)", + "block.mineralogy.andesite_relief_left": "Барельеф: Андезит (левый узор)", + "block.mineralogy.andesite_relief_pickaxe": "Барельеф: Андезит (кирка)", + "block.mineralogy.andesite_relief_plus": "Барельеф: Андезит (знак плюса)", + "block.mineralogy.andesite_relief_right": "Барельеф: Андезит (правый узор)", + "block.mineralogy.andesite_relief_sword": "Барельеф: Андезит (меч)", + "block.mineralogy.andesite_relief_vertical": "Барельеф: Андезит (вертикальный узор)", + "block.mineralogy.basalt_relief_axe": "Барельеф: Базальт (топор)", + "block.mineralogy.basalt_relief_blank": "Барельеф: Базальт (без узора)", + "block.mineralogy.basalt_relief_cross": "Барельеф: Базальт (крест)", + "block.mineralogy.basalt_relief_hammer": "Барельеф: Базальт (молот)", + "block.mineralogy.basalt_relief_hoe": "Барельеф: Базальт (мотыга)", + "block.mineralogy.basalt_relief_horizontal": "Барельеф: Базальт (горизонтальный узор)", + "block.mineralogy.basalt_relief_i": "Барельеф: Базальт (I)", + "block.mineralogy.basalt_relief_left": "Барельеф: Базальт (левый узор)", + "block.mineralogy.basalt_relief_pickaxe": "Барельеф: Базальт (кирка)", + "block.mineralogy.basalt_relief_plus": "Барельеф: Базальт (знак плюса)", + "block.mineralogy.basalt_relief_right": "Барельеф: Базальт (правый узор)", + "block.mineralogy.basalt_relief_sword": "Барельеф: Базальт (меч)", + "block.mineralogy.basalt_relief_vertical": "Барельеф: Базальт (вертикальный узор)", + "block.mineralogy.diorite_relief_axe": "Барельеф: Диорит (топор)", + "block.mineralogy.diorite_relief_blank": "Барельеф: Диорит (без узора)", + "block.mineralogy.diorite_relief_cross": "Барельеф: Диорит (крест)", + "block.mineralogy.diorite_relief_hammer": "Барельеф: Диорит (молот)", + "block.mineralogy.diorite_relief_hoe": "Барельеф: Диорит (мотыга)", + "block.mineralogy.diorite_relief_horizontal": "Барельеф: Диорит (горизонтальный узор)", + "block.mineralogy.diorite_relief_i": "Барельеф: Диорит (I)", + "block.mineralogy.diorite_relief_left": "Барельеф: Диорит (левый узор)", + "block.mineralogy.diorite_relief_pickaxe": "Барельеф: Диорит (кирка)", + "block.mineralogy.diorite_relief_plus": "Барельеф: Диорит (знак плюса)", + "block.mineralogy.diorite_relief_right": "Барельеф: Диорит (правый узор)", + "block.mineralogy.diorite_relief_sword": "Барельеф: Диорит (меч)", + "block.mineralogy.diorite_relief_vertical": "Барельеф: Диорит (вертикальный узор)", + "block.mineralogy.granite_relief_axe": "Барельеф: Гранит (топор)", + "block.mineralogy.granite_relief_blank": "Барельеф: Гранит (без узора)", + "block.mineralogy.granite_relief_cross": "Барельеф: Гранит (крест)", + "block.mineralogy.granite_relief_hammer": "Барельеф: Гранит (молот)", + "block.mineralogy.granite_relief_hoe": "Барельеф: Гранит (мотыга)", + "block.mineralogy.granite_relief_horizontal": "Барельеф: Гранит (горизонтальный узор)", + "block.mineralogy.granite_relief_i": "Барельеф: Гранит (I)", + "block.mineralogy.granite_relief_left": "Барельеф: Гранит (левый узор)", + "block.mineralogy.granite_relief_pickaxe": "Барельеф: Гранит (кирка)", + "block.mineralogy.granite_relief_plus": "Барельеф: Гранит (знак плюса)", + "block.mineralogy.granite_relief_right": "Барельеф: Гранит (правый узор)", + "block.mineralogy.granite_relief_sword": "Барельеф: Гранит (меч)", + "block.mineralogy.granite_relief_vertical": "Барельеф: Гранит (вертикальный узор)", + "block.mineralogy.rhyolite_relief_axe": "Барельеф: Риолит (топор)", + "block.mineralogy.rhyolite_relief_blank": "Барельеф: Риолит (без узора)", + "block.mineralogy.rhyolite_relief_cross": "Барельеф: Риолит (крест)", + "block.mineralogy.rhyolite_relief_hammer": "Барельеф: Риолит (молот)", + "block.mineralogy.rhyolite_relief_hoe": "Барельеф: Риолит (мотыга)", + "block.mineralogy.rhyolite_relief_horizontal": "Барельеф: Риолит (горизонтальный узор)", + "block.mineralogy.rhyolite_relief_i": "Барельеф: Риолит (I)", + "block.mineralogy.rhyolite_relief_left": "Барельеф: Риолит (левый узор)", + "block.mineralogy.rhyolite_relief_pickaxe": "Барельеф: Риолит (кирка)", + "block.mineralogy.rhyolite_relief_plus": "Барельеф: Риолит (знак плюса)", + "block.mineralogy.rhyolite_relief_right": "Барельеф: Риолит (правый узор)", + "block.mineralogy.rhyolite_relief_sword": "Барельеф: Риолит (меч)", + "block.mineralogy.rhyolite_relief_vertical": "Барельеф: Риолит (вертикальный узор)", + "block.mineralogy.pegmatite_relief_axe": "Барельеф: Пегматит (топор)", + "block.mineralogy.pegmatite_relief_blank": "Барельеф: Пегматит (без узора)", + "block.mineralogy.pegmatite_relief_cross": "Барельеф: Пегматит (крест)", + "block.mineralogy.pegmatite_relief_hammer": "Барельеф: Пегматит (молот)", + "block.mineralogy.pegmatite_relief_hoe": "Барельеф: Пегматит (мотыга)", + "block.mineralogy.pegmatite_relief_horizontal": "Барельеф: Пегматит (горизонтальный узор)", + "block.mineralogy.pegmatite_relief_i": "Барельеф: Пегматит (I)", + "block.mineralogy.pegmatite_relief_left": "Барельеф: Пегматит (левый узор)", + "block.mineralogy.pegmatite_relief_pickaxe": "Барельеф: Пегматит (кирка)", + "block.mineralogy.pegmatite_relief_plus": "Барельеф: Пегматит (знак плюса)", + "block.mineralogy.pegmatite_relief_right": "Барельеф: Пегматит (правый узор)", + "block.mineralogy.pegmatite_relief_sword": "Барельеф: Пегматит (меч)", + "block.mineralogy.pegmatite_relief_vertical": "Барельеф: Пегматит (вертикальный узор)", + "block.mineralogy.shale_relief_axe": "Барельеф: Глинистый сланец (топор)", + "block.mineralogy.shale_relief_blank": "Барельеф: Глинистый сланец (без узора)", + "block.mineralogy.shale_relief_cross": "Барельеф: Глинистый сланец (крест)", + "block.mineralogy.shale_relief_hammer": "Барельеф: Глинистый сланец (молот)", + "block.mineralogy.shale_relief_hoe": "Барельеф: Глинистый сланец (мотыга)", + "block.mineralogy.shale_relief_horizontal": "Барельеф: Глинистый сланец (горизонтальный узор)", + "block.mineralogy.shale_relief_i": "Барельеф: Глинистый сланец (I)", + "block.mineralogy.shale_relief_left": "Барельеф: Глинистый сланец (левый узор)", + "block.mineralogy.shale_relief_pickaxe": "Барельеф: Глинистый сланец (кирка)", + "block.mineralogy.shale_relief_plus": "Барельеф: Глинистый сланец (знак плюса)", + "block.mineralogy.shale_relief_right": "Барельеф: Глинистый сланец (правый узор)", + "block.mineralogy.shale_relief_sword": "Барельеф: Глинистый сланец (меч)", + "block.mineralogy.shale_relief_vertical": "Барельеф: Глинистый сланец (вертикальный узор)", + "block.mineralogy.conglomerate_relief_axe": "Барельеф: Конгломерат (топор)", + "block.mineralogy.conglomerate_relief_blank": "Барельеф: Конгломерат (без узора)", + "block.mineralogy.conglomerate_relief_cross": "Барельеф: Конгломерат (крест)", + "block.mineralogy.conglomerate_relief_hammer": "Барельеф: Конгломерат (молот)", + "block.mineralogy.conglomerate_relief_hoe": "Барельеф: Конгломерат (мотыга)", + "block.mineralogy.conglomerate_relief_horizontal": "Барельеф: Конгломерат (горизонтальный узор)", + "block.mineralogy.conglomerate_relief_i": "Барельеф: Конгломерат (I)", + "block.mineralogy.conglomerate_relief_left": "Барельеф: Конгломерат (левый узор)", + "block.mineralogy.conglomerate_relief_pickaxe": "Барельеф: Конгломерат (кирка)", + "block.mineralogy.conglomerate_relief_plus": "Барельеф: Конгломерат (знак плюса)", + "block.mineralogy.conglomerate_relief_right": "Барельеф: Конгломерат (правый узор)", + "block.mineralogy.conglomerate_relief_sword": "Барельеф: Конгломерат (меч)", + "block.mineralogy.conglomerate_relief_vertical": "Барельеф: Конгломерат (вертикальный узор)", + "block.mineralogy.dolomite_relief_axe": "Барельеф: Доломит (топор)", + "block.mineralogy.dolomite_relief_blank": "Барельеф: Доломит (без узора)", + "block.mineralogy.dolomite_relief_cross": "Барельеф: Доломит (крест)", + "block.mineralogy.dolomite_relief_hammer": "Барельеф: Доломит (молот)", + "block.mineralogy.dolomite_relief_hoe": "Барельеф: Доломит (мотыга)", + "block.mineralogy.dolomite_relief_horizontal": "Барельеф: Доломит (горизонтальный узор)", + "block.mineralogy.dolomite_relief_i": "Барельеф: Доломит (I)", + "block.mineralogy.dolomite_relief_left": "Барельеф: Доломит (левый узор)", + "block.mineralogy.dolomite_relief_pickaxe": "Барельеф: Доломит (кирка)", + "block.mineralogy.dolomite_relief_plus": "Барельеф: Доломит (знак плюса)", + "block.mineralogy.dolomite_relief_right": "Барельеф: Доломит (правый узор)", + "block.mineralogy.dolomite_relief_sword": "Барельеф: Доломит (меч)", + "block.mineralogy.dolomite_relief_vertical": "Барельеф: Доломит (вертикальный узор)", + "block.mineralogy.limestone_relief_axe": "Барельеф: Известняк (топор)", + "block.mineralogy.limestone_relief_blank": "Барельеф: Известняк (без узора)", + "block.mineralogy.limestone_relief_cross": "Барельеф: Известняк (крест)", + "block.mineralogy.limestone_relief_hammer": "Барельеф: Известняк (молот)", + "block.mineralogy.limestone_relief_hoe": "Барельеф: Известняк (мотыга)", + "block.mineralogy.limestone_relief_horizontal": "Барельеф: Известняк (горизонтальный узор)", + "block.mineralogy.limestone_relief_i": "Барельеф: Известняк (I)", + "block.mineralogy.limestone_relief_left": "Барельеф: Известняк (левый узор)", + "block.mineralogy.limestone_relief_pickaxe": "Барельеф: Известняк (кирка)", + "block.mineralogy.limestone_relief_plus": "Барельеф: Известняк (знак плюса)", + "block.mineralogy.limestone_relief_right": "Барельеф: Известняк (правый узор)", + "block.mineralogy.limestone_relief_sword": "Барельеф: Известняк (меч)", + "block.mineralogy.limestone_relief_vertical": "Барельеф: Известняк (вертикальный узор)", + "block.mineralogy.marble_relief_axe": "Барельеф: Мрамор (топор)", + "block.mineralogy.marble_relief_blank": "Барельеф: Мрамор (без узора)", + "block.mineralogy.marble_relief_cross": "Барельеф: Мрамор (крест)", + "block.mineralogy.marble_relief_hammer": "Барельеф: Мрамор (молот)", + "block.mineralogy.marble_relief_hoe": "Барельеф: Мрамор (мотыга)", + "block.mineralogy.marble_relief_horizontal": "Барельеф: Мрамор (горизонтальный узор)", + "block.mineralogy.marble_relief_i": "Барельеф: Мрамор (I)", + "block.mineralogy.marble_relief_left": "Барельеф: Мрамор (левый узор)", + "block.mineralogy.marble_relief_pickaxe": "Барельеф: Мрамор (кирка)", + "block.mineralogy.marble_relief_plus": "Барельеф: Мрамор (знак плюса)", + "block.mineralogy.marble_relief_right": "Барельеф: Мрамор (правый узор)", + "block.mineralogy.marble_relief_sword": "Барельеф: Мрамор (меч)", + "block.mineralogy.marble_relief_vertical": "Барельеф: Мрамор (вертикальный узор)", + "block.mineralogy.slate_relief_axe": "Барельеф: Аспидный сланец (топор)", + "block.mineralogy.slate_relief_blank": "Барельеф: Аспидный сланец (без узора)", + "block.mineralogy.slate_relief_cross": "Барельеф: Аспидный сланец (крест)", + "block.mineralogy.slate_relief_hammer": "Барельеф: Аспидный сланец (молот)", + "block.mineralogy.slate_relief_hoe": "Барельеф: Аспидный сланец (мотыга)", + "block.mineralogy.slate_relief_horizontal": "Барельеф: Аспидный сланец (горизонтальный узор)", + "block.mineralogy.slate_relief_i": "Барельеф: Аспидный сланец (I)", + "block.mineralogy.slate_relief_left": "Барельеф: Аспидный сланец (левый узор)", + "block.mineralogy.slate_relief_pickaxe": "Барельеф: Аспидный сланец (кирка)", + "block.mineralogy.slate_relief_plus": "Барельеф: Аспидный сланец (знак плюса)", + "block.mineralogy.slate_relief_right": "Барельеф: Аспидный сланец (правый узор)", + "block.mineralogy.slate_relief_sword": "Барельеф: Аспидный сланец (меч)", + "block.mineralogy.slate_relief_vertical": "Барельеф: Аспидный сланец (вертикальный узор)", + "block.mineralogy.schist_relief_axe": "Барельеф: Кристаллический сланец (топор)", + "block.mineralogy.schist_relief_blank": "Барельеф: Кристаллический сланец (без узора)", + "block.mineralogy.schist_relief_cross": "Барельеф: Кристаллический сланец (крест)", + "block.mineralogy.schist_relief_hammer": "Барельеф: Кристаллический сланец (молот)", + "block.mineralogy.schist_relief_hoe": "Барельеф: Кристаллический сланец (мотыга)", + "block.mineralogy.schist_relief_horizontal": "Барельеф: Кристаллический сланец (горизонтальный узор)", + "block.mineralogy.schist_relief_i": "Барельеф: Кристаллический сланец (I)", + "block.mineralogy.schist_relief_left": "Барельеф: Кристаллический сланец (левый узор)", + "block.mineralogy.schist_relief_pickaxe": "Барельеф: Кристаллический сланец (кирка)", + "block.mineralogy.schist_relief_plus": "Барельеф: Кристаллический сланец (знак плюса)", + "block.mineralogy.schist_relief_right": "Барельеф: Кристаллический сланец (правый узор)", + "block.mineralogy.schist_relief_sword": "Барельеф: Кристаллический сланец (меч)", + "block.mineralogy.schist_relief_vertical": "Барельеф: Кристаллический сланец (вертикальный узор)", + "block.mineralogy.gneiss_relief_axe": "Барельеф: Гнейс (топор)", + "block.mineralogy.gneiss_relief_blank": "Барельеф: Гнейс (без узора)", + "block.mineralogy.gneiss_relief_cross": "Барельеф: Гнейс (крест)", + "block.mineralogy.gneiss_relief_hammer": "Барельеф: Гнейс (молот)", + "block.mineralogy.gneiss_relief_hoe": "Барельеф: Гнейс (мотыга)", + "block.mineralogy.gneiss_relief_horizontal": "Барельеф: Гнейс (горизонтальный узор)", + "block.mineralogy.gneiss_relief_i": "Барельеф: Гнейс (I)", + "block.mineralogy.gneiss_relief_left": "Барельеф: Гнейс (левый узор)", + "block.mineralogy.gneiss_relief_pickaxe": "Барельеф: Гнейс (кирка)", + "block.mineralogy.gneiss_relief_plus": "Барельеф: Гнейс (знак плюса)", + "block.mineralogy.gneiss_relief_right": "Барельеф: Гнейс (правый узор)", + "block.mineralogy.gneiss_relief_sword": "Барельеф: Гнейс (меч)", + "block.mineralogy.gneiss_relief_vertical": "Барельеф: Гнейс (вертикальный узор)", + "block.mineralogy.phyllite_relief_axe": "Барельеф: Филлит (топор)", + "block.mineralogy.phyllite_relief_blank": "Барельеф: Филлит (без узора)", + "block.mineralogy.phyllite_relief_cross": "Барельеф: Филлит (крест)", + "block.mineralogy.phyllite_relief_hammer": "Барельеф: Филлит (молот)", + "block.mineralogy.phyllite_relief_hoe": "Барельеф: Филлит (мотыга)", + "block.mineralogy.phyllite_relief_horizontal": "Барельеф: Филлит (горизонтальный узор)", + "block.mineralogy.phyllite_relief_i": "Барельеф: Филлит (I)", + "block.mineralogy.phyllite_relief_left": "Барельеф: Филлит (левый узор)", + "block.mineralogy.phyllite_relief_pickaxe": "Барельеф: Филлит (кирка)", + "block.mineralogy.phyllite_relief_plus": "Барельеф: Филлит (знак плюса)", + "block.mineralogy.phyllite_relief_right": "Барельеф: Филлит (правый узор)", + "block.mineralogy.phyllite_relief_sword": "Барельеф: Филлит (меч)", + "block.mineralogy.phyllite_relief_vertical": "Барельеф: Филлит (вертикальный узор)", + "block.mineralogy.amphibolite_relief_axe": "Барельеф: Амфиболит (топор)", + "block.mineralogy.amphibolite_relief_blank": "Барельеф: Амфиболит (без узора)", + "block.mineralogy.amphibolite_relief_cross": "Барельеф: Амфиболит (крест)", + "block.mineralogy.amphibolite_relief_hammer": "Барельеф: Амфиболит (молот)", + "block.mineralogy.amphibolite_relief_hoe": "Барельеф: Амфиболит (мотыга)", + "block.mineralogy.amphibolite_relief_horizontal": "Барельеф: Амфиболит (горизонтальный узор)", + "block.mineralogy.amphibolite_relief_i": "Барельеф: Амфиболит (I)", + "block.mineralogy.amphibolite_relief_left": "Барельеф: Амфиболит (левый узор)", + "block.mineralogy.amphibolite_relief_pickaxe": "Барельеф: Амфиболит (кирка)", + "block.mineralogy.amphibolite_relief_plus": "Барельеф: Амфиболит (знак плюса)", + "block.mineralogy.amphibolite_relief_right": "Барельеф: Амфиболит (правый узор)", + "block.mineralogy.amphibolite_relief_sword": "Барельеф: Амфиболит (меч)", + "block.mineralogy.amphibolite_relief_vertical": "Барельеф: Амфиболит (вертикальный узор)", + "block.mineralogy.diabase_relief_axe": "Барельеф: Диабаз (топор)", + "block.mineralogy.diabase_relief_blank": "Барельеф: Диабаз (без узора)", + "block.mineralogy.diabase_relief_cross": "Барельеф: Диабаз (крест)", + "block.mineralogy.diabase_relief_hammer": "Барельеф: Диабаз (молот)", + "block.mineralogy.diabase_relief_hoe": "Барельеф: Диабаз (мотыга)", + "block.mineralogy.diabase_relief_horizontal": "Барельеф: Диабаз (горизонтальный узор)", + "block.mineralogy.diabase_relief_i": "Барельеф: Диабаз (I)", + "block.mineralogy.diabase_relief_left": "Барельеф: Диабаз (левый узор)", + "block.mineralogy.diabase_relief_pickaxe": "Барельеф: Диабаз (кирка)", + "block.mineralogy.diabase_relief_plus": "Барельеф: Диабаз (знак плюса)", + "block.mineralogy.diabase_relief_right": "Барельеф: Диабаз (правый узор)", + "block.mineralogy.diabase_relief_sword": "Барельеф: Диабаз (меч)", + "block.mineralogy.diabase_relief_vertical": "Барельеф: Диабаз (вертикальный узор)", + "block.mineralogy.gabbro_relief_axe": "Барельеф: Габбро (топор)", + "block.mineralogy.gabbro_relief_blank": "Барельеф: Габбро (без узора)", + "block.mineralogy.gabbro_relief_cross": "Барельеф: Габбро (крест)", + "block.mineralogy.gabbro_relief_hammer": "Барельеф: Габбро (молот)", + "block.mineralogy.gabbro_relief_hoe": "Барельеф: Габбро (мотыга)", + "block.mineralogy.gabbro_relief_horizontal": "Барельеф: Габбро (горизонтальный узор)", + "block.mineralogy.gabbro_relief_i": "Барельеф: Габбро (I)", + "block.mineralogy.gabbro_relief_left": "Барельеф: Габбро (левый узор)", + "block.mineralogy.gabbro_relief_pickaxe": "Барельеф: Габбро (кирка)", + "block.mineralogy.gabbro_relief_plus": "Барельеф: Габбро (знак плюса)", + "block.mineralogy.gabbro_relief_right": "Барельеф: Габбро (правый узор)", + "block.mineralogy.gabbro_relief_sword": "Барельеф: Габбро (меч)", + "block.mineralogy.gabbro_relief_vertical": "Барельеф: Габбро (вертикальный узор)", + "block.mineralogy.peridotite_relief_axe": "Барельеф: Перидотит (топор)", + "block.mineralogy.peridotite_relief_blank": "Барельеф: Перидотит (без узора)", + "block.mineralogy.peridotite_relief_cross": "Барельеф: Перидотит (крест)", + "block.mineralogy.peridotite_relief_hammer": "Барельеф: Перидотит (молот)", + "block.mineralogy.peridotite_relief_hoe": "Барельеф: Перидотит (мотыга)", + "block.mineralogy.peridotite_relief_horizontal": "Барельеф: Перидотит (горизонтальный узор)", + "block.mineralogy.peridotite_relief_i": "Барельеф: Перидотит (I)", + "block.mineralogy.peridotite_relief_left": "Барельеф: Перидотит (левый узор)", + "block.mineralogy.peridotite_relief_pickaxe": "Барельеф: Перидотит (кирка)", + "block.mineralogy.peridotite_relief_plus": "Барельеф: Перидотит (знак плюса)", + "block.mineralogy.peridotite_relief_right": "Барельеф: Перидотит (правый узор)", + "block.mineralogy.peridotite_relief_sword": "Барельеф: Перидотит (меч)", + "block.mineralogy.peridotite_relief_vertical": "Барельеф: Перидотит (вертикальный узор)", + "block.mineralogy.basaltic_glass_relief_axe": "Барельеф: Базальтовое стекло (топор)", + "block.mineralogy.basaltic_glass_relief_blank": "Барельеф: Базальтовое стекло (без узора)", + "block.mineralogy.basaltic_glass_relief_cross": "Барельеф: Базальтовое стекло (крест)", + "block.mineralogy.basaltic_glass_relief_hammer": "Барельеф: Базальтовое стекло (молот)", + "block.mineralogy.basaltic_glass_relief_hoe": "Барельеф: Базальтовое стекло (мотыга)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Барельеф: Базальтовое стекло (горизонтальный узор)", + "block.mineralogy.basaltic_glass_relief_i": "Барельеф: Базальтовое стекло (I)", + "block.mineralogy.basaltic_glass_relief_left": "Барельеф: Базальтовое стекло (левый узор)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Барельеф: Базальтовое стекло (кирка)", + "block.mineralogy.basaltic_glass_relief_plus": "Барельеф: Базальтовое стекло (знак плюса)", + "block.mineralogy.basaltic_glass_relief_right": "Барельеф: Базальтовое стекло (правый узор)", + "block.mineralogy.basaltic_glass_relief_sword": "Барельеф: Базальтовое стекло (меч)", + "block.mineralogy.basaltic_glass_relief_vertical": "Барельеф: Базальтовое стекло (вертикальный узор)", + "block.mineralogy.scoria_relief_axe": "Барельеф: Скория (топор)", + "block.mineralogy.scoria_relief_blank": "Барельеф: Скория (без узора)", + "block.mineralogy.scoria_relief_cross": "Барельеф: Скория (крест)", + "block.mineralogy.scoria_relief_hammer": "Барельеф: Скория (молот)", + "block.mineralogy.scoria_relief_hoe": "Барельеф: Скория (мотыга)", + "block.mineralogy.scoria_relief_horizontal": "Барельеф: Скория (горизонтальный узор)", + "block.mineralogy.scoria_relief_i": "Барельеф: Скория (I)", + "block.mineralogy.scoria_relief_left": "Барельеф: Скория (левый узор)", + "block.mineralogy.scoria_relief_pickaxe": "Барельеф: Скория (кирка)", + "block.mineralogy.scoria_relief_plus": "Барельеф: Скория (знак плюса)", + "block.mineralogy.scoria_relief_right": "Барельеф: Скория (правый узор)", + "block.mineralogy.scoria_relief_sword": "Барельеф: Скория (меч)", + "block.mineralogy.scoria_relief_vertical": "Барельеф: Скория (вертикальный узор)", + "block.mineralogy.tuff_relief_axe": "Барельеф: Туф (топор)", + "block.mineralogy.tuff_relief_blank": "Барельеф: Туф (без узора)", + "block.mineralogy.tuff_relief_cross": "Барельеф: Туф (крест)", + "block.mineralogy.tuff_relief_hammer": "Барельеф: Туф (молот)", + "block.mineralogy.tuff_relief_hoe": "Барельеф: Туф (мотыга)", + "block.mineralogy.tuff_relief_horizontal": "Барельеф: Туф (горизонтальный узор)", + "block.mineralogy.tuff_relief_i": "Барельеф: Туф (I)", + "block.mineralogy.tuff_relief_left": "Барельеф: Туф (левый узор)", + "block.mineralogy.tuff_relief_pickaxe": "Барельеф: Туф (кирка)", + "block.mineralogy.tuff_relief_plus": "Барельеф: Туф (знак плюса)", + "block.mineralogy.tuff_relief_right": "Барельеф: Туф (правый узор)", + "block.mineralogy.tuff_relief_sword": "Барельеф: Туф (меч)", + "block.mineralogy.tuff_relief_vertical": "Барельеф: Туф (вертикальный узор)", + "block.mineralogy.siltstone_relief_axe": "Барельеф: Алевролит (топор)", + "block.mineralogy.siltstone_relief_blank": "Барельеф: Алевролит (без узора)", + "block.mineralogy.siltstone_relief_cross": "Барельеф: Алевролит (крест)", + "block.mineralogy.siltstone_relief_hammer": "Барельеф: Алевролит (молот)", + "block.mineralogy.siltstone_relief_hoe": "Барельеф: Алевролит (мотыга)", + "block.mineralogy.siltstone_relief_horizontal": "Барельеф: Алевролит (горизонтальный узор)", + "block.mineralogy.siltstone_relief_i": "Барельеф: Алевролит (I)", + "block.mineralogy.siltstone_relief_left": "Барельеф: Алевролит (левый узор)", + "block.mineralogy.siltstone_relief_pickaxe": "Барельеф: Алевролит (кирка)", + "block.mineralogy.siltstone_relief_plus": "Барельеф: Алевролит (знак плюса)", + "block.mineralogy.siltstone_relief_right": "Барельеф: Алевролит (правый узор)", + "block.mineralogy.siltstone_relief_sword": "Барельеф: Алевролит (меч)", + "block.mineralogy.siltstone_relief_vertical": "Барельеф: Алевролит (вертикальный узор)", + "block.mineralogy.rock_salt_relief_axe": "Барельеф: Каменная соль (топор)", + "block.mineralogy.rock_salt_relief_blank": "Барельеф: Каменная соль (без узора)", + "block.mineralogy.rock_salt_relief_cross": "Барельеф: Каменная соль (крест)", + "block.mineralogy.rock_salt_relief_hammer": "Барельеф: Каменная соль (молот)", + "block.mineralogy.rock_salt_relief_hoe": "Барельеф: Каменная соль (мотыга)", + "block.mineralogy.rock_salt_relief_horizontal": "Барельеф: Каменная соль (горизонтальный узор)", + "block.mineralogy.rock_salt_relief_i": "Барельеф: Каменная соль (I)", + "block.mineralogy.rock_salt_relief_left": "Барельеф: Каменная соль (левый узор)", + "block.mineralogy.rock_salt_relief_pickaxe": "Барельеф: Каменная соль (кирка)", + "block.mineralogy.rock_salt_relief_plus": "Барельеф: Каменная соль (знак плюса)", + "block.mineralogy.rock_salt_relief_right": "Барельеф: Каменная соль (правый узор)", + "block.mineralogy.rock_salt_relief_sword": "Барельеф: Каменная соль (меч)", + "block.mineralogy.rock_salt_relief_vertical": "Барельеф: Каменная соль (вертикальный узор)", + "block.mineralogy.hornfels_relief_axe": "Барельеф: Роговик (топор)", + "block.mineralogy.hornfels_relief_blank": "Барельеф: Роговик (без узора)", + "block.mineralogy.hornfels_relief_cross": "Барельеф: Роговик (крест)", + "block.mineralogy.hornfels_relief_hammer": "Барельеф: Роговик (молот)", + "block.mineralogy.hornfels_relief_hoe": "Барельеф: Роговик (мотыга)", + "block.mineralogy.hornfels_relief_horizontal": "Барельеф: Роговик (горизонтальный узор)", + "block.mineralogy.hornfels_relief_i": "Барельеф: Роговик (I)", + "block.mineralogy.hornfels_relief_left": "Барельеф: Роговик (левый узор)", + "block.mineralogy.hornfels_relief_pickaxe": "Барельеф: Роговик (кирка)", + "block.mineralogy.hornfels_relief_plus": "Барельеф: Роговик (знак плюса)", + "block.mineralogy.hornfels_relief_right": "Барельеф: Роговик (правый узор)", + "block.mineralogy.hornfels_relief_sword": "Барельеф: Роговик (меч)", + "block.mineralogy.hornfels_relief_vertical": "Барельеф: Роговик (вертикальный узор)", + "block.mineralogy.quartzite_relief_axe": "Барельеф: Кварцит (топор)", + "block.mineralogy.quartzite_relief_blank": "Барельеф: Кварцит (без узора)", + "block.mineralogy.quartzite_relief_cross": "Барельеф: Кварцит (крест)", + "block.mineralogy.quartzite_relief_hammer": "Барельеф: Кварцит (молот)", + "block.mineralogy.quartzite_relief_hoe": "Барельеф: Кварцит (мотыга)", + "block.mineralogy.quartzite_relief_horizontal": "Барельеф: Кварцит (горизонтальный узор)", + "block.mineralogy.quartzite_relief_i": "Барельеф: Кварцит (I)", + "block.mineralogy.quartzite_relief_left": "Барельеф: Кварцит (левый узор)", + "block.mineralogy.quartzite_relief_pickaxe": "Барельеф: Кварцит (кирка)", + "block.mineralogy.quartzite_relief_plus": "Барельеф: Кварцит (знак плюса)", + "block.mineralogy.quartzite_relief_right": "Барельеф: Кварцит (правый узор)", + "block.mineralogy.quartzite_relief_sword": "Барельеф: Кварцит (меч)", + "block.mineralogy.quartzite_relief_vertical": "Барельеф: Кварцит (вертикальный узор)", + "block.mineralogy.novaculite_relief_axe": "Барельеф: Новакулит (топор)", + "block.mineralogy.novaculite_relief_blank": "Барельеф: Новакулит (без узора)", + "block.mineralogy.novaculite_relief_cross": "Барельеф: Новакулит (крест)", + "block.mineralogy.novaculite_relief_hammer": "Барельеф: Новакулит (молот)", + "block.mineralogy.novaculite_relief_hoe": "Барельеф: Новакулит (мотыга)", + "block.mineralogy.novaculite_relief_horizontal": "Барельеф: Новакулит (горизонтальный узор)", + "block.mineralogy.novaculite_relief_i": "Барельеф: Новакулит (I)", + "block.mineralogy.novaculite_relief_left": "Барельеф: Новакулит (левый узор)", + "block.mineralogy.novaculite_relief_pickaxe": "Барельеф: Новакулит (кирка)", + "block.mineralogy.novaculite_relief_plus": "Барельеф: Новакулит (знак плюса)", + "block.mineralogy.novaculite_relief_right": "Барельеф: Новакулит (правый узор)", + "block.mineralogy.novaculite_relief_sword": "Барельеф: Новакулит (меч)", + "block.mineralogy.novaculite_relief_vertical": "Барельеф: Новакулит (вертикальный узор)", "itemGroup.mineralogy.mineralogy": "Минералогия", "itemGroup.mineralogy.rock": "Минералогические породы", - "itemGroup.mineralogy.stair": "Минералогическая лестница", + "itemGroup.mineralogy.stair": "Минералогические ступеньки", "itemGroup.mineralogy.slab": "Минералогические плиты", - "itemGroup.mineralogy.wall": "Стены минералогии", - "itemGroup.mineralogy.item": "Минералогические предметы" + "itemGroup.mineralogy.wall": "Минералогические ограды", + "itemGroup.mineralogy.item": "Минералогические предметы", + "block.mineralogy.crude_oil": "Сырая нефть", + "item.mineralogy.crude_oil_bucket": "Ведро сырой нефти", + "fluid.mineralogy.crude_oil": "Сырая нефть", + "advancements.mineralogy.all_the_rocks.title": "Все горные породы", + "advancements.mineralogy.all_the_rocks.description": "Вы нашли все стандартные горные породы Минералогии!" } diff --git a/src/main/resources/assets/mineralogy/lang/zh_cn.json b/src/main/resources/assets/mineralogy/lang/zh_cn.json index 98fff602f..4fb8d511c 100644 --- a/src/main/resources/assets/mineralogy/lang/zh_cn.json +++ b/src/main/resources/assets/mineralogy/lang/zh_cn.json @@ -1,196 +1,196 @@ { "block.mineralogy.andesite": "安山岩", "block.mineralogy.andesite_stairs": "安山岩楼梯", - "block.mineralogy.andesite_slab": "安山岩板", + "block.mineralogy.andesite_slab": "安山岩台阶", "block.mineralogy.andesite_brick": "安山岩砖", "block.mineralogy.andesite_brick_stairs": "安山岩砖楼梯", - "block.mineralogy.andesite_brick_slab": "安山岩砖板", - "block.mineralogy.andesite_smooth": "精致安山岩", - "block.mineralogy.andesite_smooth_stairs": "精致安山岩楼梯", - "block.mineralogy.andesite_smooth_slab": "精致安山岩板", - "block.mineralogy.andesite_smooth_brick": "精致安山岩砖", - "block.mineralogy.andesite_smooth_brick_stairs": "精致安山岩砖楼梯", - "block.mineralogy.andesite_smooth_brick_slab": "精致安山岩砖板", + "block.mineralogy.andesite_brick_slab": "安山岩砖台阶", + "block.mineralogy.andesite_smooth": "磨制安山岩", + "block.mineralogy.andesite_smooth_stairs": "磨制安山岩楼梯", + "block.mineralogy.andesite_smooth_slab": "磨制安山岩台阶", + "block.mineralogy.andesite_smooth_brick": "磨制安山岩砖", + "block.mineralogy.andesite_smooth_brick_stairs": "磨制安山岩砖楼梯", + "block.mineralogy.andesite_smooth_brick_slab": "磨制安山岩砖台阶", "block.mineralogy.basalt": "玄武岩", "block.mineralogy.basalt_stairs": "玄武岩楼梯", - "block.mineralogy.basalt_slab": "玄武岩板", + "block.mineralogy.basalt_slab": "玄武岩台阶", "block.mineralogy.basalt_brick": "玄武岩砖", "block.mineralogy.basalt_brick_stairs": "玄武岩砖楼梯", - "block.mineralogy.basalt_brick_slab": "玄武岩砖板", - "block.mineralogy.basalt_smooth": "精致玄武岩", - "block.mineralogy.basalt_smooth_stairs": "精致玄武岩楼梯", - "block.mineralogy.basalt_smooth_slab": "精致玄武岩板", - "block.mineralogy.basalt_smooth_brick": "精致玄武岩砖", - "block.mineralogy.basalt_smooth_brick_stairs": "精致玄武岩砖楼梯", - "block.mineralogy.basalt_smooth_brick_slab": "精致玄武岩砖板", + "block.mineralogy.basalt_brick_slab": "玄武岩砖台阶", + "block.mineralogy.basalt_smooth": "磨制玄武岩", + "block.mineralogy.basalt_smooth_stairs": "磨制玄武岩楼梯", + "block.mineralogy.basalt_smooth_slab": "磨制玄武岩台阶", + "block.mineralogy.basalt_smooth_brick": "磨制玄武岩砖", + "block.mineralogy.basalt_smooth_brick_stairs": "磨制玄武岩砖楼梯", + "block.mineralogy.basalt_smooth_brick_slab": "磨制玄武岩砖台阶", "block.mineralogy.diorite": "闪长岩", "block.mineralogy.diorite_stairs": "闪长岩楼梯", - "block.mineralogy.diorite_slab": "闪长岩板", + "block.mineralogy.diorite_slab": "闪长岩台阶", "block.mineralogy.diorite_brick": "闪长岩砖", "block.mineralogy.diorite_brick_stairs": "闪长岩砖楼梯", - "block.mineralogy.diorite_brick_slab": "闪长岩砖板", - "block.mineralogy.diorite_smooth": "精致闪长岩", - "block.mineralogy.diorite_smooth_stairs": "精致闪长岩楼梯", - "block.mineralogy.diorite_smooth_slab": "精致闪长岩板", - "block.mineralogy.diorite_smooth_brick": "精致闪长岩砖", - "block.mineralogy.diorite_smooth_brick_stairs": "精致闪长岩砖楼梯", - "block.mineralogy.diorite_smooth_brick_slab": "精致闪长岩砖板", + "block.mineralogy.diorite_brick_slab": "闪长岩砖台阶", + "block.mineralogy.diorite_smooth": "磨制闪长岩", + "block.mineralogy.diorite_smooth_stairs": "磨制闪长岩楼梯", + "block.mineralogy.diorite_smooth_slab": "磨制闪长岩台阶", + "block.mineralogy.diorite_smooth_brick": "磨制闪长岩砖", + "block.mineralogy.diorite_smooth_brick_stairs": "磨制闪长岩砖楼梯", + "block.mineralogy.diorite_smooth_brick_slab": "磨制闪长岩砖台阶", "block.mineralogy.granite": "花岗岩", "block.mineralogy.granite_stairs": "花岗岩楼梯", - "block.mineralogy.granite_slab": "花岗岩板", + "block.mineralogy.granite_slab": "花岗岩台阶", "block.mineralogy.granite_brick": "花岗岩砖", "block.mineralogy.granite_brick_stairs": "花岗岩砖楼梯", - "block.mineralogy.granite_brick_slab": "花岗岩砖板", - "block.mineralogy.granite_smooth": "精致花岗岩", - "block.mineralogy.granite_smooth_stairs": "精致花岗岩楼梯", - "block.mineralogy.granite_smooth_slab": "精致花岗岩板", - "block.mineralogy.granite_smooth_brick": "精致花岗岩砖", - "block.mineralogy.granite_smooth_brick_stairs": "精致花岗岩砖楼梯", - "block.mineralogy.granite_smooth_brick_slab": "精致花岗岩砖板", + "block.mineralogy.granite_brick_slab": "花岗岩砖台阶", + "block.mineralogy.granite_smooth": "磨制花岗岩", + "block.mineralogy.granite_smooth_stairs": "磨制花岗岩楼梯", + "block.mineralogy.granite_smooth_slab": "磨制花岗岩台阶", + "block.mineralogy.granite_smooth_brick": "磨制花岗岩砖", + "block.mineralogy.granite_smooth_brick_stairs": "磨制花岗岩砖楼梯", + "block.mineralogy.granite_smooth_brick_slab": "磨制花岗岩砖台阶", "block.mineralogy.rhyolite": "流纹岩", "block.mineralogy.rhyolite_stairs": "流纹岩楼梯", - "block.mineralogy.rhyolite_slab": "流纹岩板", + "block.mineralogy.rhyolite_slab": "流纹岩台阶", "block.mineralogy.rhyolite_brick": "流纹岩砖", "block.mineralogy.rhyolite_brick_stairs": "流纹岩砖楼梯", - "block.mineralogy.rhyolite_brick_slab": "流纹岩砖板", - "block.mineralogy.rhyolite_smooth": "精致流纹岩", - "block.mineralogy.rhyolite_smooth_stairs": "精致流纹岩楼梯", - "block.mineralogy.rhyolite_smooth_slab": "精致流纹岩板", - "block.mineralogy.rhyolite_smooth_brick": "精致流纹岩砖", - "block.mineralogy.rhyolite_smooth_brick_stairs": "精致流纹岩砖楼梯", - "block.mineralogy.rhyolite_smooth_brick_slab": "精致流纹岩砖板", + "block.mineralogy.rhyolite_brick_slab": "流纹岩砖台阶", + "block.mineralogy.rhyolite_smooth": "磨制流纹岩", + "block.mineralogy.rhyolite_smooth_stairs": "磨制流纹岩楼梯", + "block.mineralogy.rhyolite_smooth_slab": "磨制流纹岩台阶", + "block.mineralogy.rhyolite_smooth_brick": "磨制流纹岩砖", + "block.mineralogy.rhyolite_smooth_brick_stairs": "磨制流纹岩砖楼梯", + "block.mineralogy.rhyolite_smooth_brick_slab": "磨制流纹岩砖台阶", "block.mineralogy.pegmatite": "伟晶岩", "block.mineralogy.pegmatite_stairs": "伟晶岩楼梯", - "block.mineralogy.pegmatite_slab": "伟晶岩板", + "block.mineralogy.pegmatite_slab": "伟晶岩台阶", "block.mineralogy.pegmatite_brick": "伟晶岩砖", "block.mineralogy.pegmatite_brick_stairs": "伟晶岩砖楼梯", - "block.mineralogy.pegmatite_brick_slab": "伟晶岩砖板", - "block.mineralogy.pegmatite_smooth": "精致伟晶岩", - "block.mineralogy.pegmatite_smooth_stairs": "精致伟晶岩楼梯", - "block.mineralogy.pegmatite_smooth_slab": "精致伟晶岩板", - "block.mineralogy.pegmatite_smooth_brick": "精致伟晶岩砖", - "block.mineralogy.pegmatite_smooth_brick_stairs": "精致伟晶岩砖楼梯", - "block.mineralogy.pegmatite_smooth_brick_slab": "精致伟晶岩砖板", + "block.mineralogy.pegmatite_brick_slab": "伟晶岩砖台阶", + "block.mineralogy.pegmatite_smooth": "磨制伟晶岩", + "block.mineralogy.pegmatite_smooth_stairs": "磨制伟晶岩楼梯", + "block.mineralogy.pegmatite_smooth_slab": "磨制伟晶岩台阶", + "block.mineralogy.pegmatite_smooth_brick": "磨制伟晶岩砖", + "block.mineralogy.pegmatite_smooth_brick_stairs": "磨制伟晶岩砖楼梯", + "block.mineralogy.pegmatite_smooth_brick_slab": "磨制伟晶岩砖台阶", "block.mineralogy.shale": "页岩", "block.mineralogy.shale_stairs": "页岩楼梯", - "block.mineralogy.shale_slab": "页岩板", + "block.mineralogy.shale_slab": "页岩台阶", "block.mineralogy.shale_brick": "页岩砖", "block.mineralogy.shale_brick_stairs": "页岩砖楼梯", - "block.mineralogy.shale_brick_slab": "页岩砖板", - "block.mineralogy.shale_smooth": "精致页岩", - "block.mineralogy.shale_smooth_stairs": "精致页岩楼梯", - "block.mineralogy.shale_smooth_slab": "精致页岩板", - "block.mineralogy.shale_smooth_brick": "精致页岩砖", - "block.mineralogy.shale_smooth_brick_stairs": "精致页岩砖楼梯", - "block.mineralogy.shale_smooth_brick_slab": "精致页岩砖板", + "block.mineralogy.shale_brick_slab": "页岩砖台阶", + "block.mineralogy.shale_smooth": "磨制页岩", + "block.mineralogy.shale_smooth_stairs": "磨制页岩楼梯", + "block.mineralogy.shale_smooth_slab": "磨制页岩台阶", + "block.mineralogy.shale_smooth_brick": "磨制页岩砖", + "block.mineralogy.shale_smooth_brick_stairs": "磨制页岩砖楼梯", + "block.mineralogy.shale_smooth_brick_slab": "磨制页岩砖台阶", "block.mineralogy.conglomerate": "砾岩", "block.mineralogy.conglomerate_stairs": "砾岩楼梯", - "block.mineralogy.conglomerate_slab": "砾岩板", + "block.mineralogy.conglomerate_slab": "砾岩台阶", "block.mineralogy.conglomerate_brick": "砾岩砖", "block.mineralogy.conglomerate_brick_stairs": "砾岩砖楼梯", - "block.mineralogy.conglomerate_brick_slab": "砾岩砖板", - "block.mineralogy.conglomerate_smooth": "精致砾岩", - "block.mineralogy.conglomerate_smooth_stairs": "精致砾岩楼梯", - "block.mineralogy.conglomerate_smooth_slab": "精致砾岩板", - "block.mineralogy.conglomerate_smooth_brick": "精致砾岩砖", - "block.mineralogy.conglomerate_smooth_brick_stairs": "精致砾岩砖楼梯", - "block.mineralogy.conglomerate_smooth_brick_slab": "精致砾岩砖板", - "block.mineralogy.dolomite": "白云石", - "block.mineralogy.dolomite_stairs": "白云石楼梯", - "block.mineralogy.dolomite_slab": "白云石板", - "block.mineralogy.dolomite_brick": "白云石砖", - "block.mineralogy.dolomite_brick_stairs": "白云石砖楼梯", - "block.mineralogy.dolomite_brick_slab": "白云石砖板", - "block.mineralogy.dolomite_smooth": "精致白云石", - "block.mineralogy.dolomite_smooth_stairs": "精致白云石楼梯", - "block.mineralogy.dolomite_smooth_slab": "精致白云石板", - "block.mineralogy.dolomite_smooth_brick": "精致白云石砖", - "block.mineralogy.dolomite_smooth_brick_stairs": "精致白云石砖楼梯", - "block.mineralogy.dolomite_smooth_brick_slab": "精致白云石砖板", + "block.mineralogy.conglomerate_brick_slab": "砾岩砖台阶", + "block.mineralogy.conglomerate_smooth": "磨制砾岩", + "block.mineralogy.conglomerate_smooth_stairs": "磨制砾岩楼梯", + "block.mineralogy.conglomerate_smooth_slab": "磨制砾岩台阶", + "block.mineralogy.conglomerate_smooth_brick": "磨制砾岩砖", + "block.mineralogy.conglomerate_smooth_brick_stairs": "磨制砾岩砖楼梯", + "block.mineralogy.conglomerate_smooth_brick_slab": "磨制砾岩砖台阶", + "block.mineralogy.dolomite": "白云岩", + "block.mineralogy.dolomite_stairs": "白云岩楼梯", + "block.mineralogy.dolomite_slab": "白云岩台阶", + "block.mineralogy.dolomite_brick": "白云岩砖", + "block.mineralogy.dolomite_brick_stairs": "白云岩砖楼梯", + "block.mineralogy.dolomite_brick_slab": "白云岩砖台阶", + "block.mineralogy.dolomite_smooth": "磨制白云岩", + "block.mineralogy.dolomite_smooth_stairs": "磨制白云岩楼梯", + "block.mineralogy.dolomite_smooth_slab": "磨制白云岩台阶", + "block.mineralogy.dolomite_smooth_brick": "磨制白云岩砖", + "block.mineralogy.dolomite_smooth_brick_stairs": "磨制白云岩砖楼梯", + "block.mineralogy.dolomite_smooth_brick_slab": "磨制白云岩砖台阶", "block.mineralogy.limestone": "石灰石", "block.mineralogy.limestone_stairs": "石灰石楼梯", - "block.mineralogy.limestone_slab": "石灰石板", + "block.mineralogy.limestone_slab": "石灰石台阶", "block.mineralogy.limestone_brick": "石灰石砖", "block.mineralogy.limestone_brick_stairs": "石灰石砖楼梯", - "block.mineralogy.limestone_brick_slab": "石灰石砖板", - "block.mineralogy.limestone_smooth": "精致石灰石", - "block.mineralogy.limestone_smooth_stairs": "精致石灰石楼梯", - "block.mineralogy.limestone_smooth_slab": "精致石灰石板", - "block.mineralogy.limestone_smooth_brick": "精致石灰石砖", - "block.mineralogy.limestone_smooth_brick_stairs": "精致石灰石砖楼梯", - "block.mineralogy.limestone_smooth_brick_slab": "精致石灰石砖板", + "block.mineralogy.limestone_brick_slab": "石灰石砖台阶", + "block.mineralogy.limestone_smooth": "磨制石灰石", + "block.mineralogy.limestone_smooth_stairs": "磨制石灰石楼梯", + "block.mineralogy.limestone_smooth_slab": "磨制石灰石台阶", + "block.mineralogy.limestone_smooth_brick": "磨制石灰石砖", + "block.mineralogy.limestone_smooth_brick_stairs": "磨制石灰石砖楼梯", + "block.mineralogy.limestone_smooth_brick_slab": "磨制石灰石砖台阶", "block.mineralogy.slate": "板岩", "block.mineralogy.slate_stairs": "板岩楼梯", - "block.mineralogy.slate_slab": "板岩", + "block.mineralogy.slate_slab": "板岩台阶", "block.mineralogy.slate_brick": "板岩砖", "block.mineralogy.slate_brick_stairs": "板岩砖楼梯", - "block.mineralogy.slate_brick_slab": "板岩砖板", - "block.mineralogy.slate_smooth": "精致板岩", - "block.mineralogy.slate_smooth_stairs": "精致板岩楼梯", - "block.mineralogy.slate_smooth_slab": "精致板岩板", - "block.mineralogy.slate_smooth_brick": "精致板岩砖", - "block.mineralogy.slate_smooth_brick_stairs": "精致板岩砖楼梯", - "block.mineralogy.slate_smooth_brick_slab": "精致板岩砖板", + "block.mineralogy.slate_brick_slab": "板岩砖台阶", + "block.mineralogy.slate_smooth": "磨制板岩", + "block.mineralogy.slate_smooth_stairs": "磨制板岩楼梯", + "block.mineralogy.slate_smooth_slab": "磨制板岩台阶", + "block.mineralogy.slate_smooth_brick": "磨制板岩砖", + "block.mineralogy.slate_smooth_brick_stairs": "磨制板岩砖楼梯", + "block.mineralogy.slate_smooth_brick_slab": "磨制板岩砖台阶", "block.mineralogy.schist": "片岩", "block.mineralogy.schist_stairs": "片岩楼梯", - "block.mineralogy.schist_slab": "片岩板", + "block.mineralogy.schist_slab": "片岩台阶", "block.mineralogy.schist_brick": "片岩砖", "block.mineralogy.schist_brick_stairs": "片岩砖楼梯", - "block.mineralogy.schist_brick_slab": "片岩砖板", - "block.mineralogy.schist_smooth": "精致片岩", - "block.mineralogy.schist_smooth_stairs": "精致片岩楼梯", - "block.mineralogy.schist_smooth_slab": "精致片岩板", - "block.mineralogy.schist_smooth_brick": "精致片岩砖", - "block.mineralogy.schist_smooth_brick_stairs": "精致片岩砖楼梯", - "block.mineralogy.schist_smooth_brick_slab": "精致片岩砖板", + "block.mineralogy.schist_brick_slab": "片岩砖台阶", + "block.mineralogy.schist_smooth": "磨制片岩", + "block.mineralogy.schist_smooth_stairs": "磨制片岩楼梯", + "block.mineralogy.schist_smooth_slab": "磨制片岩台阶", + "block.mineralogy.schist_smooth_brick": "磨制片岩砖", + "block.mineralogy.schist_smooth_brick_stairs": "磨制片岩砖楼梯", + "block.mineralogy.schist_smooth_brick_slab": "磨制片岩砖台阶", "block.mineralogy.gneiss": "片麻岩", "block.mineralogy.gneiss_stairs": "片麻岩楼梯", - "block.mineralogy.gneiss_slab": "片麻岩板", - "block.mineralogy.gneiss_brick": "片麻岩板", + "block.mineralogy.gneiss_slab": "片麻岩台阶", + "block.mineralogy.gneiss_brick": "片麻岩砖", "block.mineralogy.gneiss_brick_stairs": "片麻岩砖楼梯", - "block.mineralogy.gneiss_brick_slab": "片麻岩砖板", - "block.mineralogy.gneiss_smooth": "精致片麻岩", - "block.mineralogy.gneiss_smooth_stairs": "精致片麻岩楼梯", - "block.mineralogy.gneiss_smooth_slab": "精致片麻岩板", - "block.mineralogy.gneiss_smooth_brick": "精致片麻岩砖", - "block.mineralogy.gneiss_smooth_brick_stairs": "精致片麻岩砖楼梯", - "block.mineralogy.gneiss_smooth_brick_slab": "精致片麻岩砖板", + "block.mineralogy.gneiss_brick_slab": "片麻岩砖台阶", + "block.mineralogy.gneiss_smooth": "磨制片麻岩", + "block.mineralogy.gneiss_smooth_stairs": "磨制片麻岩楼梯", + "block.mineralogy.gneiss_smooth_slab": "磨制片麻岩台阶", + "block.mineralogy.gneiss_smooth_brick": "磨制片麻岩砖", + "block.mineralogy.gneiss_smooth_brick_stairs": "磨制片麻岩砖楼梯", + "block.mineralogy.gneiss_smooth_brick_slab": "磨制片麻岩砖台阶", "block.mineralogy.marble": "大理石", "block.mineralogy.marble_stairs": "大理石楼梯", - "block.mineralogy.marble_slab": "大理石板", + "block.mineralogy.marble_slab": "大理石台阶", "block.mineralogy.marble_brick": "大理石砖", "block.mineralogy.marble_brick_stairs": "大理石砖楼梯", - "block.mineralogy.marble_brick_slab": "大理石砖板", - "block.mineralogy.marble_smooth": "精致大理石", - "block.mineralogy.marble_smooth_stairs": "精致大理石楼梯", - "block.mineralogy.marble_smooth_slab": "精致大理石板", - "block.mineralogy.marble_smooth_brick": "精致大理石砖", - "block.mineralogy.marble_smooth_brick_stairs": "精致大理石砖楼梯", - "block.mineralogy.marble_smooth_brick_slab": "精致大理石砖板", + "block.mineralogy.marble_brick_slab": "大理石砖台阶", + "block.mineralogy.marble_smooth": "磨制大理石", + "block.mineralogy.marble_smooth_stairs": "磨制大理石楼梯", + "block.mineralogy.marble_smooth_slab": "磨制大理石台阶", + "block.mineralogy.marble_smooth_brick": "磨制大理石砖", + "block.mineralogy.marble_smooth_brick_stairs": "磨制大理石砖楼梯", + "block.mineralogy.marble_smooth_brick_slab": "磨制大理石砖台阶", "block.mineralogy.phyllite": "千枚岩", "block.mineralogy.phyllite_stairs": "千枚岩楼梯", - "block.mineralogy.phyllite_slab": "千枚岩板", + "block.mineralogy.phyllite_slab": "千枚岩台阶", "block.mineralogy.phyllite_brick": "千枚岩砖", "block.mineralogy.phyllite_brick_stairs": "千枚岩砖楼梯", - "block.mineralogy.phyllite_brick_slab": "千枚岩砖板", - "block.mineralogy.phyllite_smooth": "精致千枚岩", - "block.mineralogy.phyllite_smooth_stairs": "精致千枚岩楼梯", - "block.mineralogy.phyllite_smooth_slab": "精致千枚岩板", - "block.mineralogy.phyllite_smooth_brick": "精致千枚岩砖", - "block.mineralogy.phyllite_smooth_brick_stairs": "精致千枚岩砖楼梯", - "block.mineralogy.phyllite_smooth_brick_slab": "精致千枚岩砖板", - "block.mineralogy.amphibolite": "闪岩", - "block.mineralogy.amphibolite_stairs": "闪岩楼梯", - "block.mineralogy.amphibolite_slab": "闪岩板", - "block.mineralogy.amphibolite_brick": "闪岩砖", - "block.mineralogy.amphibolite_brick_stairs": "闪岩砖楼梯", - "block.mineralogy.amphibolite_brick_slab": "闪岩砖板", - "block.mineralogy.amphibolite_smooth": "精致闪岩", - "block.mineralogy.amphibolite_smooth_stairs": "精致闪岩楼梯", - "block.mineralogy.amphibolite_smooth_slab": "精致闪岩板", - "block.mineralogy.amphibolite_smooth_brick": "精致闪岩砖", - "block.mineralogy.amphibolite_smooth_brick_stairs": "精致闪岩砖楼梯", - "block.mineralogy.amphibolite_smooth_brick_slab": "精致闪岩砖板", + "block.mineralogy.phyllite_brick_slab": "千枚岩砖台阶", + "block.mineralogy.phyllite_smooth": "磨制千枚岩", + "block.mineralogy.phyllite_smooth_stairs": "磨制千枚岩楼梯", + "block.mineralogy.phyllite_smooth_slab": "磨制千枚岩台阶", + "block.mineralogy.phyllite_smooth_brick": "磨制千枚岩砖", + "block.mineralogy.phyllite_smooth_brick_stairs": "磨制千枚岩砖楼梯", + "block.mineralogy.phyllite_smooth_brick_slab": "磨制千枚岩砖台阶", + "block.mineralogy.amphibolite": "角闪岩", + "block.mineralogy.amphibolite_stairs": "角闪岩楼梯", + "block.mineralogy.amphibolite_slab": "角闪岩台阶", + "block.mineralogy.amphibolite_brick": "角闪岩砖", + "block.mineralogy.amphibolite_brick_stairs": "角闪岩砖楼梯", + "block.mineralogy.amphibolite_brick_slab": "角闪岩砖台阶", + "block.mineralogy.amphibolite_smooth": "磨制角闪岩", + "block.mineralogy.amphibolite_smooth_stairs": "磨制角闪岩楼梯", + "block.mineralogy.amphibolite_smooth_slab": "磨制角闪岩台阶", + "block.mineralogy.amphibolite_smooth_brick": "磨制角闪岩砖", + "block.mineralogy.amphibolite_smooth_brick_stairs": "磨制角闪岩砖楼梯", + "block.mineralogy.amphibolite_smooth_brick_slab": "磨制角闪岩砖台阶", "item.mineralogy.gypsum_dust": "石膏粉", "item.mineralogy.sulfur_dust": "硫磺粉", "item.mineralogy.phosphorous_dust": "磷粉", @@ -199,12 +199,12 @@ "block.mineralogy.chert": "燧石", "block.mineralogy.gypsum": "石膏", "block.mineralogy.pumice": "浮石", - "block.mineralogy.sulfur_block": "硫", - "block.mineralogy.sulfur_ore": "硫矿", + "block.mineralogy.sulfur_block": "硫磺", + "block.mineralogy.sulfur_ore": "硫磺矿石", "block.mineralogy.phosphorous_block": "磷", - "block.mineralogy.phosphorous_ore": "磷矿", + "block.mineralogy.phosphorous_ore": "磷矿石", "block.mineralogy.nitrate_block": "硝酸盐", - "block.mineralogy.nitrate_ore": "硝酸盐矿", + "block.mineralogy.nitrate_ore": "硝酸盐矿石", "block.mineralogy.drywall_black": "黑色石膏板", "block.mineralogy.drywall_red": "红色石膏板", "block.mineralogy.drywall_green": "绿色石膏板", @@ -215,726 +215,726 @@ "block.mineralogy.drywall_silver": "浅灰色石膏板", "block.mineralogy.drywall_gray": "灰色石膏板", "block.mineralogy.drywall_pink": "粉红色石膏板", - "block.mineralogy.drywall_lime": "柠檬绿石膏板", + "block.mineralogy.drywall_lime": "黄绿色石膏板", "block.mineralogy.drywall_yellow": "黄色石膏板", - "block.mineralogy.drywall_light_blue": "浅蓝色石膏板", - "block.mineralogy.drywall_magenta": "洋红色石膏板", + "block.mineralogy.drywall_light_blue": "淡蓝色石膏板", + "block.mineralogy.drywall_magenta": "品红色石膏板", "block.mineralogy.drywall_orange": "橙色石膏板", "block.mineralogy.drywall_white": "白色石膏板", "block.mineralogy.andesite_wall": "安山岩墙", - "block.mineralogy.andesite_brick_wall": "安山石砖墙", - "block.mineralogy.andesite_smooth_wall": "安山岩抛光墙", - "block.mineralogy.andesite_smooth_brick_wall": "安山岩抛光砖墙", + "block.mineralogy.andesite_brick_wall": "安山岩砖墙", + "block.mineralogy.andesite_smooth_wall": "磨制安山岩墙", + "block.mineralogy.andesite_smooth_brick_wall": "磨制安山岩砖墙", "block.mineralogy.basalt_wall": "玄武岩墙", "block.mineralogy.basalt_brick_wall": "玄武岩砖墙", - "block.mineralogy.basalt_smooth_wall": "玄武岩抛光墙", - "block.mineralogy.basalt_smooth_brick_wall": "玄武岩抛光砖墙", + "block.mineralogy.basalt_smooth_wall": "磨制玄武岩墙", + "block.mineralogy.basalt_smooth_brick_wall": "磨制玄武岩砖墙", "block.mineralogy.diorite_wall": "闪长岩墙", "block.mineralogy.diorite_brick_wall": "闪长岩砖墙", - "block.mineralogy.diorite_smooth_wall": "闪长岩抛光墙", - "block.mineralogy.diorite_smooth_brick_wall": "闪长岩抛光砖墙", + "block.mineralogy.diorite_smooth_wall": "磨制闪长岩墙", + "block.mineralogy.diorite_smooth_brick_wall": "磨制闪长岩砖墙", "block.mineralogy.granite_wall": "花岗岩墙", "block.mineralogy.granite_brick_wall": "花岗岩砖墙", - "block.mineralogy.granite_smooth_wall": "花岗岩抛光墙", - "block.mineralogy.granite_smooth_brick_wall": "花岗岩抛光砖墙", + "block.mineralogy.granite_smooth_wall": "磨制花岗岩墙", + "block.mineralogy.granite_smooth_brick_wall": "磨制花岗岩砖墙", "block.mineralogy.rhyolite_wall": "流纹岩墙", "block.mineralogy.rhyolite_brick_wall": "流纹岩砖墙", - "block.mineralogy.rhyolite_smooth_wall": "流纹岩抛光墙", - "block.mineralogy.rhyolite_smooth_brick_wall": "流纹岩抛光砖墙", + "block.mineralogy.rhyolite_smooth_wall": "磨制流纹岩墙", + "block.mineralogy.rhyolite_smooth_brick_wall": "磨制流纹岩砖墙", "block.mineralogy.pegmatite_wall": "伟晶岩墙", "block.mineralogy.pegmatite_brick_wall": "伟晶岩砖墙", - "block.mineralogy.pegmatite_smooth_wall": "伟晶岩抛光墙", - "block.mineralogy.pegmatite_smooth_brick_wall": "伟晶岩抛光砖墙", + "block.mineralogy.pegmatite_smooth_wall": "磨制伟晶岩墙", + "block.mineralogy.pegmatite_smooth_brick_wall": "磨制伟晶岩砖墙", "block.mineralogy.shale_wall": "页岩墙", "block.mineralogy.shale_brick_wall": "页岩砖墙", - "block.mineralogy.shale_smooth_wall": "页岩抛光墙", - "block.mineralogy.shale_smooth_brick_wall": "页岩抛光砖墙", + "block.mineralogy.shale_smooth_wall": "磨制页岩墙", + "block.mineralogy.shale_smooth_brick_wall": "磨制页岩砖墙", "block.mineralogy.conglomerate_wall": "砾岩墙", "block.mineralogy.conglomerate_brick_wall": "砾岩砖墙", - "block.mineralogy.conglomerate_smooth_wall": "砾岩抛光墙", - "block.mineralogy.conglomerate_smooth_brick_wall": "砾岩抛光砖墙", + "block.mineralogy.conglomerate_smooth_wall": "磨制砾岩墙", + "block.mineralogy.conglomerate_smooth_brick_wall": "磨制砾岩砖墙", "block.mineralogy.dolomite_wall": "白云岩墙", "block.mineralogy.dolomite_brick_wall": "白云岩砖墙", - "block.mineralogy.dolomite_smooth_wall": "白云岩抛光墙", - "block.mineralogy.dolomite_smooth_brick_wall": "白云岩抛光砖墙", + "block.mineralogy.dolomite_smooth_wall": "磨制白云岩墙", + "block.mineralogy.dolomite_smooth_brick_wall": "磨制白云岩砖墙", "block.mineralogy.limestone_wall": "石灰石墙", "block.mineralogy.limestone_brick_wall": "石灰石砖墙", - "block.mineralogy.limestone_smooth_wall": "石灰石抛光墙", - "block.mineralogy.limestone_smooth_brick_wall": "石灰石抛光砖墙", + "block.mineralogy.limestone_smooth_wall": "磨制石灰石墙", + "block.mineralogy.limestone_smooth_brick_wall": "磨制石灰石砖墙", "block.mineralogy.marble_wall": "大理石墙", "block.mineralogy.marble_brick_wall": "大理石砖墙", - "block.mineralogy.marble_smooth_wall": "大理石抛光墙", - "block.mineralogy.marble_smooth_brick_wall": "大理石抛光砖墙", + "block.mineralogy.marble_smooth_wall": "磨制大理石墙", + "block.mineralogy.marble_smooth_brick_wall": "磨制大理石砖墙", "block.mineralogy.slate_wall": "板岩墙", "block.mineralogy.slate_brick_wall": "板岩砖墙", - "block.mineralogy.slate_smooth_wall": "板岩抛光墙", - "block.mineralogy.slate_smooth_brick_wall": "板岩抛光砖墙", + "block.mineralogy.slate_smooth_wall": "磨制板岩墙", + "block.mineralogy.slate_smooth_brick_wall": "磨制板岩砖墙", "block.mineralogy.schist_wall": "片岩墙", "block.mineralogy.schist_brick_wall": "片岩砖墙", - "block.mineralogy.schist_smooth_wall": "片岩抛光墙", - "block.mineralogy.schist_smooth_brick_wall": "片岩抛光砖墙", + "block.mineralogy.schist_smooth_wall": "磨制片岩墙", + "block.mineralogy.schist_smooth_brick_wall": "磨制片岩砖墙", "block.mineralogy.gneiss_wall": "片麻岩墙", "block.mineralogy.gneiss_brick_wall": "片麻岩砖墙", - "block.mineralogy.gneiss_smooth_wall": "片麻岩抛光墙", - "block.mineralogy.gneiss_smooth_brick_wall": "片麻岩抛光砖墙", + "block.mineralogy.gneiss_smooth_wall": "磨制片麻岩墙", + "block.mineralogy.gneiss_smooth_brick_wall": "磨制片麻岩砖墙", "block.mineralogy.phyllite_wall": "千枚岩墙", "block.mineralogy.phyllite_brick_wall": "千枚岩砖墙", - "block.mineralogy.phyllite_smooth_wall": "千枚岩抛光墙", - "block.mineralogy.phyllite_smooth_brick_wall": "千枚岩抛光砖墙", - "block.mineralogy.amphibolite_wall": "闪岩墙", - "block.mineralogy.amphibolite_brick_wall": "闪岩砖墙", - "block.mineralogy.amphibolite_smooth_wall": "闪岩抛光墙", - "block.mineralogy.amphibolite_smooth_brick_wall": "闪岩抛光砖墙", - "block.mineralogy.andesite_furnace": "安山岩炉", - "block.mineralogy.andesite_brick_furnace": "安山石砖炉", - "block.mineralogy.andesite_smooth_furnace": "安山岩抛光炉", - "block.mineralogy.andesite_smooth_brick_furnace": "安山岩抛光砖炉", - "block.mineralogy.basalt_furnace": "玄武岩炉", - "block.mineralogy.basalt_brick_furnace": "玄武岩砖炉", - "block.mineralogy.basalt_smooth_furnace": "玄武岩抛光炉", - "block.mineralogy.basalt_smooth_brick_furnace": "玄武岩抛光砖炉", - "block.mineralogy.diorite_furnace": "闪长岩炉", - "block.mineralogy.diorite_brick_furnace": "闪长岩砖炉", - "block.mineralogy.diorite_smooth_furnace": "闪长岩抛光炉", - "block.mineralogy.diorite_smooth_brick_furnace": "闪长岩抛光砖炉", - "block.mineralogy.granite_furnace": "花岗岩炉", - "block.mineralogy.granite_brick_furnace": "花岗岩砖炉", - "block.mineralogy.granite_smooth_furnace": "花岗岩抛光炉", - "block.mineralogy.granite_smooth_brick_furnace": "花岗岩抛光砖炉", - "block.mineralogy.rhyolite_furnace": "流纹岩炉", - "block.mineralogy.rhyolite_brick_furnace": "流纹岩砖炉", - "block.mineralogy.rhyolite_smooth_furnace": "流纹岩抛光炉", - "block.mineralogy.rhyolite_smooth_brick_furnace": "流纹岩抛光砖炉", - "block.mineralogy.pegmatite_furnace": "伟晶岩炉", - "block.mineralogy.pegmatite_brick_furnace": "伟晶岩砖炉", - "block.mineralogy.pegmatite_smooth_furnace": "伟晶岩抛光炉", - "block.mineralogy.pegmatite_smooth_brick_furnace": "伟晶岩抛光砖炉", - "block.mineralogy.shale_furnace": "页岩炉", - "block.mineralogy.shale_brick_furnace": "页岩砖炉", - "block.mineralogy.shale_smooth_furnace": "页岩抛光炉", - "block.mineralogy.shale_smooth_brick_furnace": "页岩抛光砖炉", - "block.mineralogy.conglomerate_furnace": "砾岩炉", - "block.mineralogy.conglomerate_brick_furnace": "砾岩砖炉", - "block.mineralogy.conglomerate_smooth_furnace": "砾岩抛光炉", - "block.mineralogy.conglomerate_smooth_brick_furnace": "砾岩抛光砖炉", - "block.mineralogy.dolomite_furnace": "白云岩炉", - "block.mineralogy.dolomite_brick_furnace": "白云岩砖炉", - "block.mineralogy.dolomite_smooth_furnace": "白云岩抛光炉", - "block.mineralogy.dolomite_smooth_brick_furnace": "白云岩抛光砖炉", - "block.mineralogy.limestone_furnace": "石灰石炉", - "block.mineralogy.limestone_brick_furnace": "石灰石砖炉", - "block.mineralogy.limestone_smooth_furnace": "石灰石抛光炉", - "block.mineralogy.limestone_smooth_brick_furnace": "石灰石抛光砖炉", - "block.mineralogy.marble_furnace": "大理石炉", - "block.mineralogy.marble_brick_furnace": "大理石砖炉", - "block.mineralogy.marble_smooth_furnace": "大理石抛光炉", - "block.mineralogy.marble_smooth_brick_furnace": "大理石抛光砖炉", - "block.mineralogy.slate_furnace": "板岩炉", - "block.mineralogy.slate_brick_furnace": "板岩砖炉", - "block.mineralogy.slate_smooth_furnace": "板岩抛光炉", - "block.mineralogy.slate_smooth_brick_furnace": "板岩抛光砖炉", - "block.mineralogy.schist_furnace": "片岩炉", - "block.mineralogy.schist_brick_furnace": "片岩砖炉", - "block.mineralogy.schist_smooth_furnace": "片岩抛光炉", - "block.mineralogy.schist_smooth_brick_furnace": "片岩抛光砖炉", - "block.mineralogy.gneiss_furnace": "片麻岩炉", - "block.mineralogy.gneiss_brick_furnace": "片麻岩砖炉", - "block.mineralogy.gneiss_smooth_furnace": "片麻岩抛光炉", - "block.mineralogy.gneiss_smooth_brick_furnace": "片麻岩抛光砖炉", - "block.mineralogy.phyllite_furnace": "千枚岩炉", - "block.mineralogy.phyllite_brick_furnace": "千枚岩砖炉", - "block.mineralogy.phyllite_smooth_furnace": "千枚岩抛光炉", - "block.mineralogy.phyllite_smooth_brick_furnace": "千枚岩抛光砖炉", - "block.mineralogy.amphibolite_furnace": "闪岩炉", - "block.mineralogy.amphibolite_brick_furnace": "闪岩砖炉", - "block.mineralogy.amphibolite_smooth_furnace": "闪岩抛光炉", - "block.mineralogy.amphibolite_smooth_brick_furnace": "闪岩抛光砖炉", + "block.mineralogy.phyllite_smooth_wall": "磨制千枚岩墙", + "block.mineralogy.phyllite_smooth_brick_wall": "磨制千枚岩砖墙", + "block.mineralogy.amphibolite_wall": "角闪岩墙", + "block.mineralogy.amphibolite_brick_wall": "角闪岩砖墙", + "block.mineralogy.amphibolite_smooth_wall": "磨制角闪岩墙", + "block.mineralogy.amphibolite_smooth_brick_wall": "磨制角闪岩砖墙", + "block.mineralogy.andesite_furnace": "安山岩熔炉", + "block.mineralogy.andesite_brick_furnace": "安山岩砖熔炉", + "block.mineralogy.andesite_smooth_furnace": "磨制安山岩熔炉", + "block.mineralogy.andesite_smooth_brick_furnace": "磨制安山岩砖熔炉", + "block.mineralogy.basalt_furnace": "玄武岩熔炉", + "block.mineralogy.basalt_brick_furnace": "玄武岩砖熔炉", + "block.mineralogy.basalt_smooth_furnace": "磨制玄武岩熔炉", + "block.mineralogy.basalt_smooth_brick_furnace": "磨制玄武岩砖熔炉", + "block.mineralogy.diorite_furnace": "闪长岩熔炉", + "block.mineralogy.diorite_brick_furnace": "闪长岩砖熔炉", + "block.mineralogy.diorite_smooth_furnace": "磨制闪长岩熔炉", + "block.mineralogy.diorite_smooth_brick_furnace": "磨制闪长岩砖熔炉", + "block.mineralogy.granite_furnace": "花岗岩熔炉", + "block.mineralogy.granite_brick_furnace": "花岗岩砖熔炉", + "block.mineralogy.granite_smooth_furnace": "磨制花岗岩熔炉", + "block.mineralogy.granite_smooth_brick_furnace": "磨制花岗岩砖熔炉", + "block.mineralogy.rhyolite_furnace": "流纹岩熔炉", + "block.mineralogy.rhyolite_brick_furnace": "流纹岩砖熔炉", + "block.mineralogy.rhyolite_smooth_furnace": "磨制流纹岩熔炉", + "block.mineralogy.rhyolite_smooth_brick_furnace": "磨制流纹岩砖熔炉", + "block.mineralogy.pegmatite_furnace": "伟晶岩熔炉", + "block.mineralogy.pegmatite_brick_furnace": "伟晶岩砖熔炉", + "block.mineralogy.pegmatite_smooth_furnace": "磨制伟晶岩熔炉", + "block.mineralogy.pegmatite_smooth_brick_furnace": "磨制伟晶岩砖熔炉", + "block.mineralogy.shale_furnace": "页岩熔炉", + "block.mineralogy.shale_brick_furnace": "页岩砖熔炉", + "block.mineralogy.shale_smooth_furnace": "磨制页岩熔炉", + "block.mineralogy.shale_smooth_brick_furnace": "磨制页岩砖熔炉", + "block.mineralogy.conglomerate_furnace": "砾岩熔炉", + "block.mineralogy.conglomerate_brick_furnace": "砾岩砖熔炉", + "block.mineralogy.conglomerate_smooth_furnace": "磨制砾岩熔炉", + "block.mineralogy.conglomerate_smooth_brick_furnace": "磨制砾岩砖熔炉", + "block.mineralogy.dolomite_furnace": "白云岩熔炉", + "block.mineralogy.dolomite_brick_furnace": "白云岩砖熔炉", + "block.mineralogy.dolomite_smooth_furnace": "磨制白云岩熔炉", + "block.mineralogy.dolomite_smooth_brick_furnace": "磨制白云岩砖熔炉", + "block.mineralogy.limestone_furnace": "石灰石熔炉", + "block.mineralogy.limestone_brick_furnace": "石灰石砖熔炉", + "block.mineralogy.limestone_smooth_furnace": "磨制石灰石熔炉", + "block.mineralogy.limestone_smooth_brick_furnace": "磨制石灰石砖熔炉", + "block.mineralogy.marble_furnace": "大理石熔炉", + "block.mineralogy.marble_brick_furnace": "大理石砖熔炉", + "block.mineralogy.marble_smooth_furnace": "磨制大理石熔炉", + "block.mineralogy.marble_smooth_brick_furnace": "磨制大理石砖熔炉", + "block.mineralogy.slate_furnace": "板岩熔炉", + "block.mineralogy.slate_brick_furnace": "板岩砖熔炉", + "block.mineralogy.slate_smooth_furnace": "磨制板岩熔炉", + "block.mineralogy.slate_smooth_brick_furnace": "磨制板岩砖熔炉", + "block.mineralogy.schist_furnace": "片岩熔炉", + "block.mineralogy.schist_brick_furnace": "片岩砖熔炉", + "block.mineralogy.schist_smooth_furnace": "磨制片岩熔炉", + "block.mineralogy.schist_smooth_brick_furnace": "磨制片岩砖熔炉", + "block.mineralogy.gneiss_furnace": "片麻岩熔炉", + "block.mineralogy.gneiss_brick_furnace": "片麻岩砖熔炉", + "block.mineralogy.gneiss_smooth_furnace": "磨制片麻岩熔炉", + "block.mineralogy.gneiss_smooth_brick_furnace": "磨制片麻岩砖熔炉", + "block.mineralogy.phyllite_furnace": "千枚岩熔炉", + "block.mineralogy.phyllite_brick_furnace": "千枚岩砖熔炉", + "block.mineralogy.phyllite_smooth_furnace": "磨制千枚岩熔炉", + "block.mineralogy.phyllite_smooth_brick_furnace": "磨制千枚岩砖熔炉", + "block.mineralogy.amphibolite_furnace": "角闪岩熔炉", + "block.mineralogy.amphibolite_brick_furnace": "角闪岩砖熔炉", + "block.mineralogy.amphibolite_smooth_furnace": "磨制角闪岩熔炉", + "block.mineralogy.amphibolite_smooth_brick_furnace": "磨制角闪岩砖熔炉", "block.mineralogy.diabase": "辉绿岩", - "block.mineralogy.diabase_stairs": "辉绿岩 楼梯", - "block.mineralogy.diabase_slab": "辉绿岩 板", - "block.mineralogy.diabase_brick": "辉绿岩 砖", - "block.mineralogy.diabase_brick_stairs": "辉绿岩 砖楼梯", - "block.mineralogy.diabase_brick_slab": "辉绿岩 砖板", - "block.mineralogy.diabase_smooth": "Polished 辉绿岩", - "block.mineralogy.diabase_smooth_stairs": "辉绿岩 抛光楼梯", - "block.mineralogy.diabase_smooth_slab": "辉绿岩 抛光板", - "block.mineralogy.diabase_smooth_brick": "辉绿岩 抛光砖", - "block.mineralogy.diabase_smooth_brick_stairs": "辉绿岩 抛光砖楼梯", - "block.mineralogy.diabase_smooth_brick_slab": "辉绿岩 抛光砖板", - "block.mineralogy.diabase_wall": "辉绿岩 Wall", - "block.mineralogy.diabase_brick_wall": "辉绿岩 砖墙", - "block.mineralogy.diabase_smooth_wall": "辉绿岩 抛光墙", - "block.mineralogy.diabase_smooth_brick_wall": "辉绿岩 抛光砖墙", - "block.mineralogy.diabase_furnace": "辉绿岩 炉", - "block.mineralogy.diabase_brick_furnace": "辉绿岩 砖炉", - "block.mineralogy.diabase_smooth_furnace": "辉绿岩 抛光炉", - "block.mineralogy.diabase_smooth_brick_furnace": "辉绿岩 抛光砖炉", + "block.mineralogy.diabase_stairs": "辉绿岩楼梯", + "block.mineralogy.diabase_slab": "辉绿岩台阶", + "block.mineralogy.diabase_brick": "辉绿岩砖", + "block.mineralogy.diabase_brick_stairs": "辉绿岩砖楼梯", + "block.mineralogy.diabase_brick_slab": "辉绿岩砖台阶", + "block.mineralogy.diabase_smooth": "磨制辉绿岩", + "block.mineralogy.diabase_smooth_stairs": "磨制辉绿岩楼梯", + "block.mineralogy.diabase_smooth_slab": "磨制辉绿岩台阶", + "block.mineralogy.diabase_smooth_brick": "磨制辉绿岩砖", + "block.mineralogy.diabase_smooth_brick_stairs": "磨制辉绿岩砖楼梯", + "block.mineralogy.diabase_smooth_brick_slab": "磨制辉绿岩砖台阶", + "block.mineralogy.diabase_wall": "辉绿岩墙", + "block.mineralogy.diabase_brick_wall": "辉绿岩砖墙", + "block.mineralogy.diabase_smooth_wall": "磨制辉绿岩墙", + "block.mineralogy.diabase_smooth_brick_wall": "磨制辉绿岩砖墙", + "block.mineralogy.diabase_furnace": "辉绿岩熔炉", + "block.mineralogy.diabase_brick_furnace": "辉绿岩砖熔炉", + "block.mineralogy.diabase_smooth_furnace": "磨制辉绿岩熔炉", + "block.mineralogy.diabase_smooth_brick_furnace": "磨制辉绿岩砖熔炉", "block.mineralogy.gabbro": "辉长岩", - "block.mineralogy.gabbro_stairs": "辉长岩 楼梯", - "block.mineralogy.gabbro_slab": "辉长岩 板", - "block.mineralogy.gabbro_brick": "辉长岩 砖", - "block.mineralogy.gabbro_brick_stairs": "辉长岩 砖楼梯", - "block.mineralogy.gabbro_brick_slab": "辉长岩 砖板", - "block.mineralogy.gabbro_smooth": "Polished 辉长岩", - "block.mineralogy.gabbro_smooth_stairs": "辉长岩 抛光楼梯", - "block.mineralogy.gabbro_smooth_slab": "辉长岩 抛光板", - "block.mineralogy.gabbro_smooth_brick": "辉长岩 抛光砖", - "block.mineralogy.gabbro_smooth_brick_stairs": "辉长岩 抛光砖楼梯", - "block.mineralogy.gabbro_smooth_brick_slab": "辉长岩 抛光砖板", - "block.mineralogy.gabbro_wall": "辉长岩 Wall", - "block.mineralogy.gabbro_brick_wall": "辉长岩 砖墙", - "block.mineralogy.gabbro_smooth_wall": "辉长岩 抛光墙", - "block.mineralogy.gabbro_smooth_brick_wall": "辉长岩 抛光砖墙", - "block.mineralogy.gabbro_furnace": "辉长岩 炉", - "block.mineralogy.gabbro_brick_furnace": "辉长岩 砖炉", - "block.mineralogy.gabbro_smooth_furnace": "辉长岩 抛光炉", - "block.mineralogy.gabbro_smooth_brick_furnace": "辉长岩 抛光砖炉", + "block.mineralogy.gabbro_stairs": "辉长岩楼梯", + "block.mineralogy.gabbro_slab": "辉长岩台阶", + "block.mineralogy.gabbro_brick": "辉长岩砖", + "block.mineralogy.gabbro_brick_stairs": "辉长岩砖楼梯", + "block.mineralogy.gabbro_brick_slab": "辉长岩砖台阶", + "block.mineralogy.gabbro_smooth": "磨制辉长岩", + "block.mineralogy.gabbro_smooth_stairs": "磨制辉长岩楼梯", + "block.mineralogy.gabbro_smooth_slab": "磨制辉长岩台阶", + "block.mineralogy.gabbro_smooth_brick": "磨制辉长岩砖", + "block.mineralogy.gabbro_smooth_brick_stairs": "磨制辉长岩砖楼梯", + "block.mineralogy.gabbro_smooth_brick_slab": "磨制辉长岩砖台阶", + "block.mineralogy.gabbro_wall": "辉长岩墙", + "block.mineralogy.gabbro_brick_wall": "辉长岩砖墙", + "block.mineralogy.gabbro_smooth_wall": "磨制辉长岩墙", + "block.mineralogy.gabbro_smooth_brick_wall": "磨制辉长岩砖墙", + "block.mineralogy.gabbro_furnace": "辉长岩熔炉", + "block.mineralogy.gabbro_brick_furnace": "辉长岩砖熔炉", + "block.mineralogy.gabbro_smooth_furnace": "磨制辉长岩熔炉", + "block.mineralogy.gabbro_smooth_brick_furnace": "磨制辉长岩砖熔炉", "block.mineralogy.peridotite": "橄榄岩", - "block.mineralogy.peridotite_stairs": "橄榄岩 楼梯", - "block.mineralogy.peridotite_slab": "橄榄岩 板", - "block.mineralogy.peridotite_brick": "橄榄岩 砖", - "block.mineralogy.peridotite_brick_stairs": "橄榄岩 砖楼梯", - "block.mineralogy.peridotite_brick_slab": "橄榄岩 砖板", - "block.mineralogy.peridotite_smooth": "Polished 橄榄岩", - "block.mineralogy.peridotite_smooth_stairs": "橄榄岩 抛光楼梯", - "block.mineralogy.peridotite_smooth_slab": "橄榄岩 抛光板", - "block.mineralogy.peridotite_smooth_brick": "橄榄岩 抛光砖", - "block.mineralogy.peridotite_smooth_brick_stairs": "橄榄岩 抛光砖楼梯", - "block.mineralogy.peridotite_smooth_brick_slab": "橄榄岩 抛光砖板", - "block.mineralogy.peridotite_wall": "橄榄岩 Wall", - "block.mineralogy.peridotite_brick_wall": "橄榄岩 砖墙", - "block.mineralogy.peridotite_smooth_wall": "橄榄岩 抛光墙", - "block.mineralogy.peridotite_smooth_brick_wall": "橄榄岩 抛光砖墙", - "block.mineralogy.peridotite_furnace": "橄榄岩 炉", - "block.mineralogy.peridotite_brick_furnace": "橄榄岩 砖炉", - "block.mineralogy.peridotite_smooth_furnace": "橄榄岩 抛光炉", - "block.mineralogy.peridotite_smooth_brick_furnace": "橄榄岩 抛光砖炉", - "block.mineralogy.basaltic_glass": "玄武玻璃", - "block.mineralogy.basaltic_glass_stairs": "玄武玻璃 楼梯", - "block.mineralogy.basaltic_glass_slab": "玄武玻璃 板", - "block.mineralogy.basaltic_glass_brick": "玄武玻璃 砖", - "block.mineralogy.basaltic_glass_brick_stairs": "玄武玻璃 砖楼梯", - "block.mineralogy.basaltic_glass_brick_slab": "玄武玻璃 砖板", - "block.mineralogy.basaltic_glass_smooth": "Polished 玄武玻璃", - "block.mineralogy.basaltic_glass_smooth_stairs": "玄武玻璃 抛光楼梯", - "block.mineralogy.basaltic_glass_smooth_slab": "玄武玻璃 抛光板", - "block.mineralogy.basaltic_glass_smooth_brick": "玄武玻璃 抛光砖", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "玄武玻璃 抛光砖楼梯", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "玄武玻璃 抛光砖板", - "block.mineralogy.basaltic_glass_wall": "玄武玻璃 Wall", - "block.mineralogy.basaltic_glass_brick_wall": "玄武玻璃 砖墙", - "block.mineralogy.basaltic_glass_smooth_wall": "玄武玻璃 抛光墙", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "玄武玻璃 抛光砖墙", - "block.mineralogy.basaltic_glass_furnace": "玄武玻璃 炉", - "block.mineralogy.basaltic_glass_brick_furnace": "玄武玻璃 砖炉", - "block.mineralogy.basaltic_glass_smooth_furnace": "玄武玻璃 抛光炉", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "玄武玻璃 抛光砖炉", - "block.mineralogy.scoria": "矿渣", - "block.mineralogy.scoria_stairs": "矿渣 楼梯", - "block.mineralogy.scoria_slab": "矿渣 板", - "block.mineralogy.scoria_brick": "矿渣 砖", - "block.mineralogy.scoria_brick_stairs": "矿渣 砖楼梯", - "block.mineralogy.scoria_brick_slab": "矿渣 砖板", - "block.mineralogy.scoria_smooth": "Polished 矿渣", - "block.mineralogy.scoria_smooth_stairs": "矿渣 抛光楼梯", - "block.mineralogy.scoria_smooth_slab": "矿渣 抛光板", - "block.mineralogy.scoria_smooth_brick": "矿渣 抛光砖", - "block.mineralogy.scoria_smooth_brick_stairs": "矿渣 抛光砖楼梯", - "block.mineralogy.scoria_smooth_brick_slab": "矿渣 抛光砖板", - "block.mineralogy.scoria_wall": "矿渣 Wall", - "block.mineralogy.scoria_brick_wall": "矿渣 砖墙", - "block.mineralogy.scoria_smooth_wall": "矿渣 抛光墙", - "block.mineralogy.scoria_smooth_brick_wall": "矿渣 抛光砖墙", - "block.mineralogy.scoria_furnace": "矿渣 炉", - "block.mineralogy.scoria_brick_furnace": "矿渣 砖炉", - "block.mineralogy.scoria_smooth_furnace": "矿渣 抛光炉", - "block.mineralogy.scoria_smooth_brick_furnace": "矿渣 抛光砖炉", + "block.mineralogy.peridotite_stairs": "橄榄岩楼梯", + "block.mineralogy.peridotite_slab": "橄榄岩台阶", + "block.mineralogy.peridotite_brick": "橄榄岩砖", + "block.mineralogy.peridotite_brick_stairs": "橄榄岩砖楼梯", + "block.mineralogy.peridotite_brick_slab": "橄榄岩砖台阶", + "block.mineralogy.peridotite_smooth": "磨制橄榄岩", + "block.mineralogy.peridotite_smooth_stairs": "磨制橄榄岩楼梯", + "block.mineralogy.peridotite_smooth_slab": "磨制橄榄岩台阶", + "block.mineralogy.peridotite_smooth_brick": "磨制橄榄岩砖", + "block.mineralogy.peridotite_smooth_brick_stairs": "磨制橄榄岩砖楼梯", + "block.mineralogy.peridotite_smooth_brick_slab": "磨制橄榄岩砖台阶", + "block.mineralogy.peridotite_wall": "橄榄岩墙", + "block.mineralogy.peridotite_brick_wall": "橄榄岩砖墙", + "block.mineralogy.peridotite_smooth_wall": "磨制橄榄岩墙", + "block.mineralogy.peridotite_smooth_brick_wall": "磨制橄榄岩砖墙", + "block.mineralogy.peridotite_furnace": "橄榄岩熔炉", + "block.mineralogy.peridotite_brick_furnace": "橄榄岩砖熔炉", + "block.mineralogy.peridotite_smooth_furnace": "磨制橄榄岩熔炉", + "block.mineralogy.peridotite_smooth_brick_furnace": "磨制橄榄岩砖熔炉", + "block.mineralogy.basaltic_glass": "玄武岩质玻璃", + "block.mineralogy.basaltic_glass_stairs": "玄武岩质玻璃楼梯", + "block.mineralogy.basaltic_glass_slab": "玄武岩质玻璃台阶", + "block.mineralogy.basaltic_glass_brick": "玄武岩质玻璃砖", + "block.mineralogy.basaltic_glass_brick_stairs": "玄武岩质玻璃砖楼梯", + "block.mineralogy.basaltic_glass_brick_slab": "玄武岩质玻璃砖台阶", + "block.mineralogy.basaltic_glass_smooth": "磨制玄武岩质玻璃", + "block.mineralogy.basaltic_glass_smooth_stairs": "磨制玄武岩质玻璃楼梯", + "block.mineralogy.basaltic_glass_smooth_slab": "磨制玄武岩质玻璃台阶", + "block.mineralogy.basaltic_glass_smooth_brick": "磨制玄武岩质玻璃砖", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "磨制玄武岩质玻璃砖楼梯", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "磨制玄武岩质玻璃砖台阶", + "block.mineralogy.basaltic_glass_wall": "玄武岩质玻璃墙", + "block.mineralogy.basaltic_glass_brick_wall": "玄武岩质玻璃砖墙", + "block.mineralogy.basaltic_glass_smooth_wall": "磨制玄武岩质玻璃墙", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "磨制玄武岩质玻璃砖墙", + "block.mineralogy.basaltic_glass_furnace": "玄武岩质玻璃熔炉", + "block.mineralogy.basaltic_glass_brick_furnace": "玄武岩质玻璃砖熔炉", + "block.mineralogy.basaltic_glass_smooth_furnace": "磨制玄武岩质玻璃熔炉", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "磨制玄武岩质玻璃砖熔炉", + "block.mineralogy.scoria": "火山渣", + "block.mineralogy.scoria_stairs": "火山渣楼梯", + "block.mineralogy.scoria_slab": "火山渣台阶", + "block.mineralogy.scoria_brick": "火山渣砖", + "block.mineralogy.scoria_brick_stairs": "火山渣砖楼梯", + "block.mineralogy.scoria_brick_slab": "火山渣砖台阶", + "block.mineralogy.scoria_smooth": "磨制火山渣", + "block.mineralogy.scoria_smooth_stairs": "磨制火山渣楼梯", + "block.mineralogy.scoria_smooth_slab": "磨制火山渣台阶", + "block.mineralogy.scoria_smooth_brick": "磨制火山渣砖", + "block.mineralogy.scoria_smooth_brick_stairs": "磨制火山渣砖楼梯", + "block.mineralogy.scoria_smooth_brick_slab": "磨制火山渣砖台阶", + "block.mineralogy.scoria_wall": "火山渣墙", + "block.mineralogy.scoria_brick_wall": "火山渣砖墙", + "block.mineralogy.scoria_smooth_wall": "磨制火山渣墙", + "block.mineralogy.scoria_smooth_brick_wall": "磨制火山渣砖墙", + "block.mineralogy.scoria_furnace": "火山渣熔炉", + "block.mineralogy.scoria_brick_furnace": "火山渣砖熔炉", + "block.mineralogy.scoria_smooth_furnace": "磨制火山渣熔炉", + "block.mineralogy.scoria_smooth_brick_furnace": "磨制火山渣砖熔炉", "block.mineralogy.tuff": "凝灰岩", - "block.mineralogy.tuff_stairs": "凝灰岩 楼梯", - "block.mineralogy.tuff_slab": "凝灰岩 板", - "block.mineralogy.tuff_brick": "凝灰岩 砖", - "block.mineralogy.tuff_brick_stairs": "凝灰岩 砖楼梯", - "block.mineralogy.tuff_brick_slab": "凝灰岩 砖板", - "block.mineralogy.tuff_smooth": "Polished 凝灰岩", - "block.mineralogy.tuff_smooth_stairs": "凝灰岩 抛光楼梯", - "block.mineralogy.tuff_smooth_slab": "凝灰岩 抛光板", - "block.mineralogy.tuff_smooth_brick": "凝灰岩 抛光砖", - "block.mineralogy.tuff_smooth_brick_stairs": "凝灰岩 抛光砖楼梯", - "block.mineralogy.tuff_smooth_brick_slab": "凝灰岩 抛光砖板", - "block.mineralogy.tuff_wall": "凝灰岩 Wall", - "block.mineralogy.tuff_brick_wall": "凝灰岩 砖墙", - "block.mineralogy.tuff_smooth_wall": "凝灰岩 抛光墙", - "block.mineralogy.tuff_smooth_brick_wall": "凝灰岩 抛光砖墙", - "block.mineralogy.tuff_furnace": "凝灰岩 炉", - "block.mineralogy.tuff_brick_furnace": "凝灰岩 砖炉", - "block.mineralogy.tuff_smooth_furnace": "凝灰岩 抛光炉", - "block.mineralogy.tuff_smooth_brick_furnace": "凝灰岩 抛光砖炉", + "block.mineralogy.tuff_stairs": "凝灰岩楼梯", + "block.mineralogy.tuff_slab": "凝灰岩台阶", + "block.mineralogy.tuff_brick": "凝灰岩砖", + "block.mineralogy.tuff_brick_stairs": "凝灰岩砖楼梯", + "block.mineralogy.tuff_brick_slab": "凝灰岩砖台阶", + "block.mineralogy.tuff_smooth": "磨制凝灰岩", + "block.mineralogy.tuff_smooth_stairs": "磨制凝灰岩楼梯", + "block.mineralogy.tuff_smooth_slab": "磨制凝灰岩台阶", + "block.mineralogy.tuff_smooth_brick": "磨制凝灰岩砖", + "block.mineralogy.tuff_smooth_brick_stairs": "磨制凝灰岩砖楼梯", + "block.mineralogy.tuff_smooth_brick_slab": "磨制凝灰岩砖台阶", + "block.mineralogy.tuff_wall": "凝灰岩墙", + "block.mineralogy.tuff_brick_wall": "凝灰岩砖墙", + "block.mineralogy.tuff_smooth_wall": "磨制凝灰岩墙", + "block.mineralogy.tuff_smooth_brick_wall": "磨制凝灰岩砖墙", + "block.mineralogy.tuff_furnace": "凝灰岩熔炉", + "block.mineralogy.tuff_brick_furnace": "凝灰岩砖熔炉", + "block.mineralogy.tuff_smooth_furnace": "磨制凝灰岩熔炉", + "block.mineralogy.tuff_smooth_brick_furnace": "磨制凝灰岩砖熔炉", "block.mineralogy.siltstone": "粉砂岩", - "block.mineralogy.siltstone_stairs": "粉砂岩 楼梯", - "block.mineralogy.siltstone_slab": "粉砂岩 板", - "block.mineralogy.siltstone_brick": "粉砂岩 砖", - "block.mineralogy.siltstone_brick_stairs": "粉砂岩 砖楼梯", - "block.mineralogy.siltstone_brick_slab": "粉砂岩 砖板", - "block.mineralogy.siltstone_smooth": "Polished 粉砂岩", - "block.mineralogy.siltstone_smooth_stairs": "粉砂岩 抛光楼梯", - "block.mineralogy.siltstone_smooth_slab": "粉砂岩 抛光板", - "block.mineralogy.siltstone_smooth_brick": "粉砂岩 抛光砖", - "block.mineralogy.siltstone_smooth_brick_stairs": "粉砂岩 抛光砖楼梯", - "block.mineralogy.siltstone_smooth_brick_slab": "粉砂岩 抛光砖板", - "block.mineralogy.siltstone_wall": "粉砂岩 Wall", - "block.mineralogy.siltstone_brick_wall": "粉砂岩 砖墙", - "block.mineralogy.siltstone_smooth_wall": "粉砂岩 抛光墙", - "block.mineralogy.siltstone_smooth_brick_wall": "粉砂岩 抛光砖墙", - "block.mineralogy.siltstone_furnace": "粉砂岩 炉", - "block.mineralogy.siltstone_brick_furnace": "粉砂岩 砖炉", - "block.mineralogy.siltstone_smooth_furnace": "粉砂岩 抛光炉", - "block.mineralogy.siltstone_smooth_brick_furnace": "粉砂岩 抛光砖炉", + "block.mineralogy.siltstone_stairs": "粉砂岩楼梯", + "block.mineralogy.siltstone_slab": "粉砂岩台阶", + "block.mineralogy.siltstone_brick": "粉砂岩砖", + "block.mineralogy.siltstone_brick_stairs": "粉砂岩砖楼梯", + "block.mineralogy.siltstone_brick_slab": "粉砂岩砖台阶", + "block.mineralogy.siltstone_smooth": "磨制粉砂岩", + "block.mineralogy.siltstone_smooth_stairs": "磨制粉砂岩楼梯", + "block.mineralogy.siltstone_smooth_slab": "磨制粉砂岩台阶", + "block.mineralogy.siltstone_smooth_brick": "磨制粉砂岩砖", + "block.mineralogy.siltstone_smooth_brick_stairs": "磨制粉砂岩砖楼梯", + "block.mineralogy.siltstone_smooth_brick_slab": "磨制粉砂岩砖台阶", + "block.mineralogy.siltstone_wall": "粉砂岩墙", + "block.mineralogy.siltstone_brick_wall": "粉砂岩砖墙", + "block.mineralogy.siltstone_smooth_wall": "磨制粉砂岩墙", + "block.mineralogy.siltstone_smooth_brick_wall": "磨制粉砂岩砖墙", + "block.mineralogy.siltstone_furnace": "粉砂岩熔炉", + "block.mineralogy.siltstone_brick_furnace": "粉砂岩砖熔炉", + "block.mineralogy.siltstone_smooth_furnace": "磨制粉砂岩熔炉", + "block.mineralogy.siltstone_smooth_brick_furnace": "磨制粉砂岩砖熔炉", "block.mineralogy.rock_salt": "岩盐", - "block.mineralogy.rock_salt_stairs": "岩盐 楼梯", - "block.mineralogy.rock_salt_slab": "岩盐 板", - "block.mineralogy.rock_salt_brick": "岩盐 砖", - "block.mineralogy.rock_salt_brick_stairs": "岩盐 砖楼梯", - "block.mineralogy.rock_salt_brick_slab": "岩盐 砖板", - "block.mineralogy.rock_salt_smooth": "Polished 岩盐", - "block.mineralogy.rock_salt_smooth_stairs": "岩盐 抛光楼梯", - "block.mineralogy.rock_salt_smooth_slab": "岩盐 抛光板", - "block.mineralogy.rock_salt_smooth_brick": "岩盐 抛光砖", - "block.mineralogy.rock_salt_smooth_brick_stairs": "岩盐 抛光砖楼梯", - "block.mineralogy.rock_salt_smooth_brick_slab": "岩盐 抛光砖板", - "block.mineralogy.rock_salt_wall": "岩盐 Wall", - "block.mineralogy.rock_salt_brick_wall": "岩盐 砖墙", - "block.mineralogy.rock_salt_smooth_wall": "岩盐 抛光墙", - "block.mineralogy.rock_salt_smooth_brick_wall": "岩盐 抛光砖墙", - "block.mineralogy.rock_salt_furnace": "岩盐 炉", - "block.mineralogy.rock_salt_brick_furnace": "岩盐 砖炉", - "block.mineralogy.rock_salt_smooth_furnace": "岩盐 抛光炉", - "block.mineralogy.rock_salt_smooth_brick_furnace": "岩盐 抛光砖炉", + "block.mineralogy.rock_salt_stairs": "岩盐楼梯", + "block.mineralogy.rock_salt_slab": "岩盐台阶", + "block.mineralogy.rock_salt_brick": "岩盐砖", + "block.mineralogy.rock_salt_brick_stairs": "岩盐砖楼梯", + "block.mineralogy.rock_salt_brick_slab": "岩盐砖台阶", + "block.mineralogy.rock_salt_smooth": "磨制岩盐", + "block.mineralogy.rock_salt_smooth_stairs": "磨制岩盐楼梯", + "block.mineralogy.rock_salt_smooth_slab": "磨制岩盐台阶", + "block.mineralogy.rock_salt_smooth_brick": "磨制岩盐砖", + "block.mineralogy.rock_salt_smooth_brick_stairs": "磨制岩盐砖楼梯", + "block.mineralogy.rock_salt_smooth_brick_slab": "磨制岩盐砖台阶", + "block.mineralogy.rock_salt_wall": "岩盐墙", + "block.mineralogy.rock_salt_brick_wall": "岩盐砖墙", + "block.mineralogy.rock_salt_smooth_wall": "磨制岩盐墙", + "block.mineralogy.rock_salt_smooth_brick_wall": "磨制岩盐砖墙", + "block.mineralogy.rock_salt_furnace": "岩盐熔炉", + "block.mineralogy.rock_salt_brick_furnace": "岩盐砖熔炉", + "block.mineralogy.rock_salt_smooth_furnace": "磨制岩盐熔炉", + "block.mineralogy.rock_salt_smooth_brick_furnace": "磨制岩盐砖熔炉", "block.mineralogy.hornfels": "角岩", - "block.mineralogy.hornfels_stairs": "角岩 楼梯", - "block.mineralogy.hornfels_slab": "角岩 板", - "block.mineralogy.hornfels_brick": "角岩 砖", - "block.mineralogy.hornfels_brick_stairs": "角岩 砖楼梯", - "block.mineralogy.hornfels_brick_slab": "角岩 砖板", - "block.mineralogy.hornfels_smooth": "Polished 角岩", - "block.mineralogy.hornfels_smooth_stairs": "角岩 抛光楼梯", - "block.mineralogy.hornfels_smooth_slab": "角岩 抛光板", - "block.mineralogy.hornfels_smooth_brick": "角岩 抛光砖", - "block.mineralogy.hornfels_smooth_brick_stairs": "角岩 抛光砖楼梯", - "block.mineralogy.hornfels_smooth_brick_slab": "角岩 抛光砖板", - "block.mineralogy.hornfels_wall": "角岩 Wall", - "block.mineralogy.hornfels_brick_wall": "角岩 砖墙", - "block.mineralogy.hornfels_smooth_wall": "角岩 抛光墙", - "block.mineralogy.hornfels_smooth_brick_wall": "角岩 抛光砖墙", - "block.mineralogy.hornfels_furnace": "角岩 炉", - "block.mineralogy.hornfels_brick_furnace": "角岩 砖炉", - "block.mineralogy.hornfels_smooth_furnace": "角岩 抛光炉", - "block.mineralogy.hornfels_smooth_brick_furnace": "角岩 抛光砖炉", + "block.mineralogy.hornfels_stairs": "角岩楼梯", + "block.mineralogy.hornfels_slab": "角岩台阶", + "block.mineralogy.hornfels_brick": "角岩砖", + "block.mineralogy.hornfels_brick_stairs": "角岩砖楼梯", + "block.mineralogy.hornfels_brick_slab": "角岩砖台阶", + "block.mineralogy.hornfels_smooth": "磨制角岩", + "block.mineralogy.hornfels_smooth_stairs": "磨制角岩楼梯", + "block.mineralogy.hornfels_smooth_slab": "磨制角岩台阶", + "block.mineralogy.hornfels_smooth_brick": "磨制角岩砖", + "block.mineralogy.hornfels_smooth_brick_stairs": "磨制角岩砖楼梯", + "block.mineralogy.hornfels_smooth_brick_slab": "磨制角岩砖台阶", + "block.mineralogy.hornfels_wall": "角岩墙", + "block.mineralogy.hornfels_brick_wall": "角岩砖墙", + "block.mineralogy.hornfels_smooth_wall": "磨制角岩墙", + "block.mineralogy.hornfels_smooth_brick_wall": "磨制角岩砖墙", + "block.mineralogy.hornfels_furnace": "角岩熔炉", + "block.mineralogy.hornfels_brick_furnace": "角岩砖熔炉", + "block.mineralogy.hornfels_smooth_furnace": "磨制角岩熔炉", + "block.mineralogy.hornfels_smooth_brick_furnace": "磨制角岩砖熔炉", "block.mineralogy.quartzite": "石英岩", - "block.mineralogy.quartzite_stairs": "石英岩 楼梯", - "block.mineralogy.quartzite_slab": "石英岩 板", - "block.mineralogy.quartzite_brick": "石英岩 砖", - "block.mineralogy.quartzite_brick_stairs": "石英岩 砖楼梯", - "block.mineralogy.quartzite_brick_slab": "石英岩 砖板", - "block.mineralogy.quartzite_smooth": "Polished 石英岩", - "block.mineralogy.quartzite_smooth_stairs": "石英岩 抛光楼梯", - "block.mineralogy.quartzite_smooth_slab": "石英岩 抛光板", - "block.mineralogy.quartzite_smooth_brick": "石英岩 抛光砖", - "block.mineralogy.quartzite_smooth_brick_stairs": "石英岩 抛光砖楼梯", - "block.mineralogy.quartzite_smooth_brick_slab": "石英岩 抛光砖板", - "block.mineralogy.quartzite_wall": "石英岩 Wall", - "block.mineralogy.quartzite_brick_wall": "石英岩 砖墙", - "block.mineralogy.quartzite_smooth_wall": "石英岩 抛光墙", - "block.mineralogy.quartzite_smooth_brick_wall": "石英岩 抛光砖墙", - "block.mineralogy.quartzite_furnace": "石英岩 炉", - "block.mineralogy.quartzite_brick_furnace": "石英岩 砖炉", - "block.mineralogy.quartzite_smooth_furnace": "石英岩 抛光炉", - "block.mineralogy.quartzite_smooth_brick_furnace": "石英岩 抛光砖炉", + "block.mineralogy.quartzite_stairs": "石英岩楼梯", + "block.mineralogy.quartzite_slab": "石英岩台阶", + "block.mineralogy.quartzite_brick": "石英岩砖", + "block.mineralogy.quartzite_brick_stairs": "石英岩砖楼梯", + "block.mineralogy.quartzite_brick_slab": "石英岩砖台阶", + "block.mineralogy.quartzite_smooth": "磨制石英岩", + "block.mineralogy.quartzite_smooth_stairs": "磨制石英岩楼梯", + "block.mineralogy.quartzite_smooth_slab": "磨制石英岩台阶", + "block.mineralogy.quartzite_smooth_brick": "磨制石英岩砖", + "block.mineralogy.quartzite_smooth_brick_stairs": "磨制石英岩砖楼梯", + "block.mineralogy.quartzite_smooth_brick_slab": "磨制石英岩砖台阶", + "block.mineralogy.quartzite_wall": "石英岩墙", + "block.mineralogy.quartzite_brick_wall": "石英岩砖墙", + "block.mineralogy.quartzite_smooth_wall": "磨制石英岩墙", + "block.mineralogy.quartzite_smooth_brick_wall": "磨制石英岩砖墙", + "block.mineralogy.quartzite_furnace": "石英岩熔炉", + "block.mineralogy.quartzite_brick_furnace": "石英岩砖熔炉", + "block.mineralogy.quartzite_smooth_furnace": "磨制石英岩熔炉", + "block.mineralogy.quartzite_smooth_brick_furnace": "磨制石英岩砖熔炉", "block.mineralogy.novaculite": "均密石英岩", - "block.mineralogy.novaculite_stairs": "均密石英岩 楼梯", - "block.mineralogy.novaculite_slab": "均密石英岩 板", - "block.mineralogy.novaculite_brick": "均密石英岩 砖", - "block.mineralogy.novaculite_brick_stairs": "均密石英岩 砖楼梯", - "block.mineralogy.novaculite_brick_slab": "均密石英岩 砖板", - "block.mineralogy.novaculite_smooth": "Polished 均密石英岩", - "block.mineralogy.novaculite_smooth_stairs": "均密石英岩 抛光楼梯", - "block.mineralogy.novaculite_smooth_slab": "均密石英岩 抛光板", - "block.mineralogy.novaculite_smooth_brick": "均密石英岩 抛光砖", - "block.mineralogy.novaculite_smooth_brick_stairs": "均密石英岩 抛光砖楼梯", - "block.mineralogy.novaculite_smooth_brick_slab": "均密石英岩 抛光砖板", - "block.mineralogy.novaculite_wall": "均密石英岩 Wall", - "block.mineralogy.novaculite_brick_wall": "均密石英岩 砖墙", - "block.mineralogy.novaculite_smooth_wall": "均密石英岩 抛光墙", - "block.mineralogy.novaculite_smooth_brick_wall": "均密石英岩 抛光砖墙", - "block.mineralogy.novaculite_furnace": "均密石英岩 炉", - "block.mineralogy.novaculite_brick_furnace": "均密石英岩 砖炉", - "block.mineralogy.novaculite_smooth_furnace": "均密石英岩 抛光炉", - "block.mineralogy.novaculite_smooth_brick_furnace": "均密石英岩 抛光砖炉", - "block.mineralogy.chalk": "粉笔", - "item.mineralogy.chalk_dust": "粉笔粉", + "block.mineralogy.novaculite_stairs": "均密石英岩楼梯", + "block.mineralogy.novaculite_slab": "均密石英岩台阶", + "block.mineralogy.novaculite_brick": "均密石英岩砖", + "block.mineralogy.novaculite_brick_stairs": "均密石英岩砖楼梯", + "block.mineralogy.novaculite_brick_slab": "均密石英岩砖台阶", + "block.mineralogy.novaculite_smooth": "磨制均密石英岩", + "block.mineralogy.novaculite_smooth_stairs": "磨制均密石英岩楼梯", + "block.mineralogy.novaculite_smooth_slab": "磨制均密石英岩台阶", + "block.mineralogy.novaculite_smooth_brick": "磨制均密石英岩砖", + "block.mineralogy.novaculite_smooth_brick_stairs": "磨制均密石英岩砖楼梯", + "block.mineralogy.novaculite_smooth_brick_slab": "磨制均密石英岩砖台阶", + "block.mineralogy.novaculite_wall": "均密石英岩墙", + "block.mineralogy.novaculite_brick_wall": "均密石英岩砖墙", + "block.mineralogy.novaculite_smooth_wall": "磨制均密石英岩墙", + "block.mineralogy.novaculite_smooth_brick_wall": "磨制均密石英岩砖墙", + "block.mineralogy.novaculite_furnace": "均密石英岩熔炉", + "block.mineralogy.novaculite_brick_furnace": "均密石英岩砖熔炉", + "block.mineralogy.novaculite_smooth_furnace": "磨制均密石英岩熔炉", + "block.mineralogy.novaculite_smooth_brick_furnace": "磨制均密石英岩砖熔炉", + "block.mineralogy.chalk": "白垩", + "item.mineralogy.chalk_dust": "白垩粉", "item.mineralogy.salt_dust": "盐", "item.mineralogy.rock_salt_dust": "岩盐晶体", "block.mineralogy.rocksaltlamp": "岩盐灯", "block.mineralogy.rocksaltstreetlamp": "岩盐路灯", - "block.mineralogy.andesite_relief_axe": "安山岩 斧头救济", - "block.mineralogy.andesite_relief_blank": "安山岩 空白的救济", - "block.mineralogy.andesite_relief_cross": "安山岩 交叉救济", - "block.mineralogy.andesite_relief_hammer": "安山岩 锤子救济", - "block.mineralogy.andesite_relief_hoe": "安山岩 锄头救济", - "block.mineralogy.andesite_relief_horizontal": "安山岩 水平救济", - "block.mineralogy.andesite_relief_i": "安山岩 I 浮雕", - "block.mineralogy.andesite_relief_left": "安山岩 左救济", - "block.mineralogy.andesite_relief_pickaxe": "安山岩 镐救济", - "block.mineralogy.andesite_relief_plus": "安山岩 加上救济", - "block.mineralogy.andesite_relief_right": "安山岩 正确的救济", - "block.mineralogy.andesite_relief_sword": "安山岩 剑救济", - "block.mineralogy.andesite_relief_vertical": "安山岩 垂直救济", - "block.mineralogy.basalt_relief_axe": "玄武岩 斧头救济", - "block.mineralogy.basalt_relief_blank": "玄武岩 空白的救济", - "block.mineralogy.basalt_relief_cross": "玄武岩 交叉救济", - "block.mineralogy.basalt_relief_hammer": "玄武岩 锤子救济", - "block.mineralogy.basalt_relief_hoe": "玄武岩 锄头救济", - "block.mineralogy.basalt_relief_horizontal": "玄武岩 水平救济", - "block.mineralogy.basalt_relief_i": "玄武岩 I 浮雕", - "block.mineralogy.basalt_relief_left": "玄武岩 左救济", - "block.mineralogy.basalt_relief_pickaxe": "玄武岩 镐救济", - "block.mineralogy.basalt_relief_plus": "玄武岩 加上救济", - "block.mineralogy.basalt_relief_right": "玄武岩 正确的救济", - "block.mineralogy.basalt_relief_sword": "玄武岩 剑救济", - "block.mineralogy.basalt_relief_vertical": "玄武岩 垂直救济", - "block.mineralogy.diorite_relief_axe": "闪长岩 斧头救济", - "block.mineralogy.diorite_relief_blank": "闪长岩 空白的救济", - "block.mineralogy.diorite_relief_cross": "闪长岩 交叉救济", - "block.mineralogy.diorite_relief_hammer": "闪长岩 锤子救济", - "block.mineralogy.diorite_relief_hoe": "闪长岩 锄头救济", - "block.mineralogy.diorite_relief_horizontal": "闪长岩 水平救济", - "block.mineralogy.diorite_relief_i": "闪长岩 I 浮雕", - "block.mineralogy.diorite_relief_left": "闪长岩 左救济", - "block.mineralogy.diorite_relief_pickaxe": "闪长岩 镐救济", - "block.mineralogy.diorite_relief_plus": "闪长岩 加上救济", - "block.mineralogy.diorite_relief_right": "闪长岩 正确的救济", - "block.mineralogy.diorite_relief_sword": "闪长岩 剑救济", - "block.mineralogy.diorite_relief_vertical": "闪长岩 垂直救济", - "block.mineralogy.granite_relief_axe": "花岗岩 斧头救济", - "block.mineralogy.granite_relief_blank": "花岗岩 空白的救济", - "block.mineralogy.granite_relief_cross": "花岗岩 交叉救济", - "block.mineralogy.granite_relief_hammer": "花岗岩 锤子救济", - "block.mineralogy.granite_relief_hoe": "花岗岩 锄头救济", - "block.mineralogy.granite_relief_horizontal": "花岗岩 水平救济", - "block.mineralogy.granite_relief_i": "花岗岩 I 浮雕", - "block.mineralogy.granite_relief_left": "花岗岩 左救济", - "block.mineralogy.granite_relief_pickaxe": "花岗岩 镐救济", - "block.mineralogy.granite_relief_plus": "花岗岩 加上救济", - "block.mineralogy.granite_relief_right": "花岗岩 正确的救济", - "block.mineralogy.granite_relief_sword": "花岗岩 剑救济", - "block.mineralogy.granite_relief_vertical": "花岗岩 垂直救济", - "block.mineralogy.rhyolite_relief_axe": "流纹岩 斧头救济", - "block.mineralogy.rhyolite_relief_blank": "流纹岩 空白的救济", - "block.mineralogy.rhyolite_relief_cross": "流纹岩 交叉救济", - "block.mineralogy.rhyolite_relief_hammer": "流纹岩 锤子救济", - "block.mineralogy.rhyolite_relief_hoe": "流纹岩 锄头救济", - "block.mineralogy.rhyolite_relief_horizontal": "流纹岩 水平救济", - "block.mineralogy.rhyolite_relief_i": "流纹岩 I 浮雕", - "block.mineralogy.rhyolite_relief_left": "流纹岩 左救济", - "block.mineralogy.rhyolite_relief_pickaxe": "流纹岩 镐救济", - "block.mineralogy.rhyolite_relief_plus": "流纹岩 加上救济", - "block.mineralogy.rhyolite_relief_right": "流纹岩 正确的救济", - "block.mineralogy.rhyolite_relief_sword": "流纹岩 剑救济", - "block.mineralogy.rhyolite_relief_vertical": "流纹岩 垂直救济", - "block.mineralogy.pegmatite_relief_axe": "伟晶岩 斧头救济", - "block.mineralogy.pegmatite_relief_blank": "伟晶岩 空白的救济", - "block.mineralogy.pegmatite_relief_cross": "伟晶岩 交叉救济", - "block.mineralogy.pegmatite_relief_hammer": "伟晶岩 锤子救济", - "block.mineralogy.pegmatite_relief_hoe": "伟晶岩 锄头救济", - "block.mineralogy.pegmatite_relief_horizontal": "伟晶岩 水平救济", - "block.mineralogy.pegmatite_relief_i": "伟晶岩 I 浮雕", - "block.mineralogy.pegmatite_relief_left": "伟晶岩 左救济", - "block.mineralogy.pegmatite_relief_pickaxe": "伟晶岩 镐救济", - "block.mineralogy.pegmatite_relief_plus": "伟晶岩 加上救济", - "block.mineralogy.pegmatite_relief_right": "伟晶岩 正确的救济", - "block.mineralogy.pegmatite_relief_sword": "伟晶岩 剑救济", - "block.mineralogy.pegmatite_relief_vertical": "伟晶岩 垂直救济", - "block.mineralogy.shale_relief_axe": "页岩 斧头救济", - "block.mineralogy.shale_relief_blank": "页岩 空白的救济", - "block.mineralogy.shale_relief_cross": "页岩 交叉救济", - "block.mineralogy.shale_relief_hammer": "页岩 锤子救济", - "block.mineralogy.shale_relief_hoe": "页岩 锄头救济", - "block.mineralogy.shale_relief_horizontal": "页岩 水平救济", - "block.mineralogy.shale_relief_i": "页岩 I 浮雕", - "block.mineralogy.shale_relief_left": "页岩 左救济", - "block.mineralogy.shale_relief_pickaxe": "页岩 镐救济", - "block.mineralogy.shale_relief_plus": "页岩 加上救济", - "block.mineralogy.shale_relief_right": "页岩 正确的救济", - "block.mineralogy.shale_relief_sword": "页岩 剑救济", - "block.mineralogy.shale_relief_vertical": "页岩 垂直救济", - "block.mineralogy.conglomerate_relief_axe": "砾岩 斧头救济", - "block.mineralogy.conglomerate_relief_blank": "砾岩 空白的救济", - "block.mineralogy.conglomerate_relief_cross": "砾岩 交叉救济", - "block.mineralogy.conglomerate_relief_hammer": "砾岩 锤子救济", - "block.mineralogy.conglomerate_relief_hoe": "砾岩 锄头救济", - "block.mineralogy.conglomerate_relief_horizontal": "砾岩 水平救济", - "block.mineralogy.conglomerate_relief_i": "砾岩 I 浮雕", - "block.mineralogy.conglomerate_relief_left": "砾岩 左救济", - "block.mineralogy.conglomerate_relief_pickaxe": "砾岩 镐救济", - "block.mineralogy.conglomerate_relief_plus": "砾岩 加上救济", - "block.mineralogy.conglomerate_relief_right": "砾岩 正确的救济", - "block.mineralogy.conglomerate_relief_sword": "砾岩 剑救济", - "block.mineralogy.conglomerate_relief_vertical": "砾岩 垂直救济", - "block.mineralogy.dolomite_relief_axe": "白云石 斧头救济", - "block.mineralogy.dolomite_relief_blank": "白云石 空白的救济", - "block.mineralogy.dolomite_relief_cross": "白云石 交叉救济", - "block.mineralogy.dolomite_relief_hammer": "白云石 锤子救济", - "block.mineralogy.dolomite_relief_hoe": "白云石 锄头救济", - "block.mineralogy.dolomite_relief_horizontal": "白云石 水平救济", - "block.mineralogy.dolomite_relief_i": "白云石 I 浮雕", - "block.mineralogy.dolomite_relief_left": "白云石 左救济", - "block.mineralogy.dolomite_relief_pickaxe": "白云石 镐救济", - "block.mineralogy.dolomite_relief_plus": "白云石 加上救济", - "block.mineralogy.dolomite_relief_right": "白云石 正确的救济", - "block.mineralogy.dolomite_relief_sword": "白云石 剑救济", - "block.mineralogy.dolomite_relief_vertical": "白云石 垂直救济", - "block.mineralogy.limestone_relief_axe": "石灰石 斧头救济", - "block.mineralogy.limestone_relief_blank": "石灰石 空白的救济", - "block.mineralogy.limestone_relief_cross": "石灰石 交叉救济", - "block.mineralogy.limestone_relief_hammer": "石灰石 锤子救济", - "block.mineralogy.limestone_relief_hoe": "石灰石 锄头救济", - "block.mineralogy.limestone_relief_horizontal": "石灰石 水平救济", - "block.mineralogy.limestone_relief_i": "石灰石 I 浮雕", - "block.mineralogy.limestone_relief_left": "石灰石 左救济", - "block.mineralogy.limestone_relief_pickaxe": "石灰石 镐救济", - "block.mineralogy.limestone_relief_plus": "石灰石 加上救济", - "block.mineralogy.limestone_relief_right": "石灰石 正确的救济", - "block.mineralogy.limestone_relief_sword": "石灰石 剑救济", - "block.mineralogy.limestone_relief_vertical": "石灰石 垂直救济", - "block.mineralogy.marble_relief_axe": "大理石 斧头救济", - "block.mineralogy.marble_relief_blank": "大理石 空白的救济", - "block.mineralogy.marble_relief_cross": "大理石 交叉救济", - "block.mineralogy.marble_relief_hammer": "大理石 锤子救济", - "block.mineralogy.marble_relief_hoe": "大理石 锄头救济", - "block.mineralogy.marble_relief_horizontal": "大理石 水平救济", - "block.mineralogy.marble_relief_i": "大理石 I 浮雕", - "block.mineralogy.marble_relief_left": "大理石 左救济", - "block.mineralogy.marble_relief_pickaxe": "大理石 镐救济", - "block.mineralogy.marble_relief_plus": "大理石 加上救济", - "block.mineralogy.marble_relief_right": "大理石 正确的救济", - "block.mineralogy.marble_relief_sword": "大理石 剑救济", - "block.mineralogy.marble_relief_vertical": "大理石 垂直救济", - "block.mineralogy.slate_relief_axe": "石板 斧头救济", - "block.mineralogy.slate_relief_blank": "石板 空白的救济", - "block.mineralogy.slate_relief_cross": "石板 交叉救济", - "block.mineralogy.slate_relief_hammer": "石板 锤子救济", - "block.mineralogy.slate_relief_hoe": "石板 锄头救济", - "block.mineralogy.slate_relief_horizontal": "石板 水平救济", - "block.mineralogy.slate_relief_i": "石板 I 浮雕", - "block.mineralogy.slate_relief_left": "石板 左救济", - "block.mineralogy.slate_relief_pickaxe": "石板 镐救济", - "block.mineralogy.slate_relief_plus": "石板 加上救济", - "block.mineralogy.slate_relief_right": "石板 正确的救济", - "block.mineralogy.slate_relief_sword": "石板 剑救济", - "block.mineralogy.slate_relief_vertical": "石板 垂直救济", - "block.mineralogy.schist_relief_axe": "片岩 斧头救济", - "block.mineralogy.schist_relief_blank": "片岩 空白的救济", - "block.mineralogy.schist_relief_cross": "片岩 交叉救济", - "block.mineralogy.schist_relief_hammer": "片岩 锤子救济", - "block.mineralogy.schist_relief_hoe": "片岩 锄头救济", - "block.mineralogy.schist_relief_horizontal": "片岩 水平救济", - "block.mineralogy.schist_relief_i": "片岩 I 浮雕", - "block.mineralogy.schist_relief_left": "片岩 左救济", - "block.mineralogy.schist_relief_pickaxe": "片岩 镐救济", - "block.mineralogy.schist_relief_plus": "片岩 加上救济", - "block.mineralogy.schist_relief_right": "片岩 正确的救济", - "block.mineralogy.schist_relief_sword": "片岩 剑救济", - "block.mineralogy.schist_relief_vertical": "片岩 垂直救济", - "block.mineralogy.gneiss_relief_axe": "片麻岩 斧头救济", - "block.mineralogy.gneiss_relief_blank": "片麻岩 空白的救济", - "block.mineralogy.gneiss_relief_cross": "片麻岩 交叉救济", - "block.mineralogy.gneiss_relief_hammer": "片麻岩 锤子救济", - "block.mineralogy.gneiss_relief_hoe": "片麻岩 锄头救济", - "block.mineralogy.gneiss_relief_horizontal": "片麻岩 水平救济", - "block.mineralogy.gneiss_relief_i": "片麻岩 I 浮雕", - "block.mineralogy.gneiss_relief_left": "片麻岩 左救济", - "block.mineralogy.gneiss_relief_pickaxe": "片麻岩 镐救济", - "block.mineralogy.gneiss_relief_plus": "片麻岩 加上救济", - "block.mineralogy.gneiss_relief_right": "片麻岩 正确的救济", - "block.mineralogy.gneiss_relief_sword": "片麻岩 剑救济", - "block.mineralogy.gneiss_relief_vertical": "片麻岩 垂直救济", - "block.mineralogy.phyllite_relief_axe": "千枚岩 斧头救济", - "block.mineralogy.phyllite_relief_blank": "千枚岩 空白的救济", - "block.mineralogy.phyllite_relief_cross": "千枚岩 交叉救济", - "block.mineralogy.phyllite_relief_hammer": "千枚岩 锤子救济", - "block.mineralogy.phyllite_relief_hoe": "千枚岩 锄头救济", - "block.mineralogy.phyllite_relief_horizontal": "千枚岩 水平救济", - "block.mineralogy.phyllite_relief_i": "千枚岩 I 浮雕", - "block.mineralogy.phyllite_relief_left": "千枚岩 左救济", - "block.mineralogy.phyllite_relief_pickaxe": "千枚岩 镐救济", - "block.mineralogy.phyllite_relief_plus": "千枚岩 加上救济", - "block.mineralogy.phyllite_relief_right": "千枚岩 正确的救济", - "block.mineralogy.phyllite_relief_sword": "千枚岩 剑救济", - "block.mineralogy.phyllite_relief_vertical": "千枚岩 垂直救济", - "block.mineralogy.amphibolite_relief_axe": "闪岩 斧头救济", - "block.mineralogy.amphibolite_relief_blank": "闪岩 空白的救济", - "block.mineralogy.amphibolite_relief_cross": "闪岩 交叉救济", - "block.mineralogy.amphibolite_relief_hammer": "闪岩 锤子救济", - "block.mineralogy.amphibolite_relief_hoe": "闪岩 锄头救济", - "block.mineralogy.amphibolite_relief_horizontal": "闪岩 水平救济", - "block.mineralogy.amphibolite_relief_i": "闪岩 I 浮雕", - "block.mineralogy.amphibolite_relief_left": "闪岩 左救济", - "block.mineralogy.amphibolite_relief_pickaxe": "闪岩 镐救济", - "block.mineralogy.amphibolite_relief_plus": "闪岩 加上救济", - "block.mineralogy.amphibolite_relief_right": "闪岩 正确的救济", - "block.mineralogy.amphibolite_relief_sword": "闪岩 剑救济", - "block.mineralogy.amphibolite_relief_vertical": "闪岩 垂直救济", - "block.mineralogy.diabase_relief_axe": "辉绿岩 斧头救济", - "block.mineralogy.diabase_relief_blank": "辉绿岩 空白的救济", - "block.mineralogy.diabase_relief_cross": "辉绿岩 交叉救济", - "block.mineralogy.diabase_relief_hammer": "辉绿岩 锤子救济", - "block.mineralogy.diabase_relief_hoe": "辉绿岩 锄头救济", - "block.mineralogy.diabase_relief_horizontal": "辉绿岩 水平救济", - "block.mineralogy.diabase_relief_i": "辉绿岩 I 浮雕", - "block.mineralogy.diabase_relief_left": "辉绿岩 左救济", - "block.mineralogy.diabase_relief_pickaxe": "辉绿岩 镐救济", - "block.mineralogy.diabase_relief_plus": "辉绿岩 加上救济", - "block.mineralogy.diabase_relief_right": "辉绿岩 正确的救济", - "block.mineralogy.diabase_relief_sword": "辉绿岩 剑救济", - "block.mineralogy.diabase_relief_vertical": "辉绿岩 垂直救济", - "block.mineralogy.gabbro_relief_axe": "辉长岩 斧头救济", - "block.mineralogy.gabbro_relief_blank": "辉长岩 空白的救济", - "block.mineralogy.gabbro_relief_cross": "辉长岩 交叉救济", - "block.mineralogy.gabbro_relief_hammer": "辉长岩 锤子救济", - "block.mineralogy.gabbro_relief_hoe": "辉长岩 锄头救济", - "block.mineralogy.gabbro_relief_horizontal": "辉长岩 水平救济", - "block.mineralogy.gabbro_relief_i": "辉长岩 I 浮雕", - "block.mineralogy.gabbro_relief_left": "辉长岩 左救济", - "block.mineralogy.gabbro_relief_pickaxe": "辉长岩 镐救济", - "block.mineralogy.gabbro_relief_plus": "辉长岩 加上救济", - "block.mineralogy.gabbro_relief_right": "辉长岩 正确的救济", - "block.mineralogy.gabbro_relief_sword": "辉长岩 剑救济", - "block.mineralogy.gabbro_relief_vertical": "辉长岩 垂直救济", - "block.mineralogy.peridotite_relief_axe": "橄榄岩 斧头救济", - "block.mineralogy.peridotite_relief_blank": "橄榄岩 空白的救济", - "block.mineralogy.peridotite_relief_cross": "橄榄岩 交叉救济", - "block.mineralogy.peridotite_relief_hammer": "橄榄岩 锤子救济", - "block.mineralogy.peridotite_relief_hoe": "橄榄岩 锄头救济", - "block.mineralogy.peridotite_relief_horizontal": "橄榄岩 水平救济", - "block.mineralogy.peridotite_relief_i": "橄榄岩 I 浮雕", - "block.mineralogy.peridotite_relief_left": "橄榄岩 左救济", - "block.mineralogy.peridotite_relief_pickaxe": "橄榄岩 镐救济", - "block.mineralogy.peridotite_relief_plus": "橄榄岩 加上救济", - "block.mineralogy.peridotite_relief_right": "橄榄岩 正确的救济", - "block.mineralogy.peridotite_relief_sword": "橄榄岩 剑救济", - "block.mineralogy.peridotite_relief_vertical": "橄榄岩 垂直救济", - "block.mineralogy.basaltic_glass_relief_axe": "玄武玻璃 斧头救济", - "block.mineralogy.basaltic_glass_relief_blank": "玄武玻璃 空白的救济", - "block.mineralogy.basaltic_glass_relief_cross": "玄武玻璃 交叉救济", - "block.mineralogy.basaltic_glass_relief_hammer": "玄武玻璃 锤子救济", - "block.mineralogy.basaltic_glass_relief_hoe": "玄武玻璃 锄头救济", - "block.mineralogy.basaltic_glass_relief_horizontal": "玄武玻璃 水平救济", - "block.mineralogy.basaltic_glass_relief_i": "玄武玻璃 I 浮雕", - "block.mineralogy.basaltic_glass_relief_left": "玄武玻璃 左救济", - "block.mineralogy.basaltic_glass_relief_pickaxe": "玄武玻璃 镐救济", - "block.mineralogy.basaltic_glass_relief_plus": "玄武玻璃 加上救济", - "block.mineralogy.basaltic_glass_relief_right": "玄武玻璃 正确的救济", - "block.mineralogy.basaltic_glass_relief_sword": "玄武玻璃 剑救济", - "block.mineralogy.basaltic_glass_relief_vertical": "玄武玻璃 垂直救济", - "block.mineralogy.scoria_relief_axe": "矿渣 斧头救济", - "block.mineralogy.scoria_relief_blank": "矿渣 空白的救济", - "block.mineralogy.scoria_relief_cross": "矿渣 交叉救济", - "block.mineralogy.scoria_relief_hammer": "矿渣 锤子救济", - "block.mineralogy.scoria_relief_hoe": "矿渣 锄头救济", - "block.mineralogy.scoria_relief_horizontal": "矿渣 水平救济", - "block.mineralogy.scoria_relief_i": "矿渣 I 浮雕", - "block.mineralogy.scoria_relief_left": "矿渣 左救济", - "block.mineralogy.scoria_relief_pickaxe": "矿渣 镐救济", - "block.mineralogy.scoria_relief_plus": "矿渣 加上救济", - "block.mineralogy.scoria_relief_right": "矿渣 正确的救济", - "block.mineralogy.scoria_relief_sword": "矿渣 剑救济", - "block.mineralogy.scoria_relief_vertical": "矿渣 垂直救济", - "block.mineralogy.tuff_relief_axe": "凝灰岩 斧头救济", - "block.mineralogy.tuff_relief_blank": "凝灰岩 空白的救济", - "block.mineralogy.tuff_relief_cross": "凝灰岩 交叉救济", - "block.mineralogy.tuff_relief_hammer": "凝灰岩 锤子救济", - "block.mineralogy.tuff_relief_hoe": "凝灰岩 锄头救济", - "block.mineralogy.tuff_relief_horizontal": "凝灰岩 水平救济", - "block.mineralogy.tuff_relief_i": "凝灰岩 I 浮雕", - "block.mineralogy.tuff_relief_left": "凝灰岩 左救济", - "block.mineralogy.tuff_relief_pickaxe": "凝灰岩 镐救济", - "block.mineralogy.tuff_relief_plus": "凝灰岩 加上救济", - "block.mineralogy.tuff_relief_right": "凝灰岩 正确的救济", - "block.mineralogy.tuff_relief_sword": "凝灰岩 剑救济", - "block.mineralogy.tuff_relief_vertical": "凝灰岩 垂直救济", - "block.mineralogy.siltstone_relief_axe": "粉砂岩 斧头救济", - "block.mineralogy.siltstone_relief_blank": "粉砂岩 空白的救济", - "block.mineralogy.siltstone_relief_cross": "粉砂岩 交叉救济", - "block.mineralogy.siltstone_relief_hammer": "粉砂岩 锤子救济", - "block.mineralogy.siltstone_relief_hoe": "粉砂岩 锄头救济", - "block.mineralogy.siltstone_relief_horizontal": "粉砂岩 水平救济", - "block.mineralogy.siltstone_relief_i": "粉砂岩 I 浮雕", - "block.mineralogy.siltstone_relief_left": "粉砂岩 左救济", - "block.mineralogy.siltstone_relief_pickaxe": "粉砂岩 镐救济", - "block.mineralogy.siltstone_relief_plus": "粉砂岩 加上救济", - "block.mineralogy.siltstone_relief_right": "粉砂岩 正确的救济", - "block.mineralogy.siltstone_relief_sword": "粉砂岩 剑救济", - "block.mineralogy.siltstone_relief_vertical": "粉砂岩 垂直救济", - "block.mineralogy.rock_salt_relief_axe": "岩盐 斧头救济", - "block.mineralogy.rock_salt_relief_blank": "岩盐 空白的救济", - "block.mineralogy.rock_salt_relief_cross": "岩盐 交叉救济", - "block.mineralogy.rock_salt_relief_hammer": "岩盐 锤子救济", - "block.mineralogy.rock_salt_relief_hoe": "岩盐 锄头救济", - "block.mineralogy.rock_salt_relief_horizontal": "岩盐 水平救济", - "block.mineralogy.rock_salt_relief_i": "岩盐 I 浮雕", - "block.mineralogy.rock_salt_relief_left": "岩盐 左救济", - "block.mineralogy.rock_salt_relief_pickaxe": "岩盐 镐救济", - "block.mineralogy.rock_salt_relief_plus": "岩盐 加上救济", - "block.mineralogy.rock_salt_relief_right": "岩盐 正确的救济", - "block.mineralogy.rock_salt_relief_sword": "岩盐 剑救济", - "block.mineralogy.rock_salt_relief_vertical": "岩盐 垂直救济", - "block.mineralogy.hornfels_relief_axe": "角岩 斧头救济", - "block.mineralogy.hornfels_relief_blank": "角岩 空白的救济", - "block.mineralogy.hornfels_relief_cross": "角岩 交叉救济", - "block.mineralogy.hornfels_relief_hammer": "角岩 锤子救济", - "block.mineralogy.hornfels_relief_hoe": "角岩 锄头救济", - "block.mineralogy.hornfels_relief_horizontal": "角岩 水平救济", - "block.mineralogy.hornfels_relief_i": "角岩 I 浮雕", - "block.mineralogy.hornfels_relief_left": "角岩 左救济", - "block.mineralogy.hornfels_relief_pickaxe": "角岩 镐救济", - "block.mineralogy.hornfels_relief_plus": "角岩 加上救济", - "block.mineralogy.hornfels_relief_right": "角岩 正确的救济", - "block.mineralogy.hornfels_relief_sword": "角岩 剑救济", - "block.mineralogy.hornfels_relief_vertical": "角岩 垂直救济", - "block.mineralogy.quartzite_relief_axe": "石英岩 斧头救济", - "block.mineralogy.quartzite_relief_blank": "石英岩 空白的救济", - "block.mineralogy.quartzite_relief_cross": "石英岩 交叉救济", - "block.mineralogy.quartzite_relief_hammer": "石英岩 锤子救济", - "block.mineralogy.quartzite_relief_hoe": "石英岩 锄头救济", - "block.mineralogy.quartzite_relief_horizontal": "石英岩 水平救济", - "block.mineralogy.quartzite_relief_i": "石英岩 I 浮雕", - "block.mineralogy.quartzite_relief_left": "石英岩 左救济", - "block.mineralogy.quartzite_relief_pickaxe": "石英岩 镐救济", - "block.mineralogy.quartzite_relief_plus": "石英岩 加上救济", - "block.mineralogy.quartzite_relief_right": "石英岩 正确的救济", - "block.mineralogy.quartzite_relief_sword": "石英岩 剑救济", - "block.mineralogy.quartzite_relief_vertical": "石英岩 垂直救济", - "block.mineralogy.novaculite_relief_axe": "均密石英岩 斧头救济", - "block.mineralogy.novaculite_relief_blank": "均密石英岩 空白的救济", - "block.mineralogy.novaculite_relief_cross": "均密石英岩 交叉救济", - "block.mineralogy.novaculite_relief_hammer": "均密石英岩 锤子救济", - "block.mineralogy.novaculite_relief_hoe": "均密石英岩 锄头救济", - "block.mineralogy.novaculite_relief_horizontal": "均密石英岩 水平救济", - "block.mineralogy.novaculite_relief_i": "均密石英岩 I 浮雕", - "block.mineralogy.novaculite_relief_left": "均密石英岩 左救济", - "block.mineralogy.novaculite_relief_pickaxe": "均密石英岩 镐救济", - "block.mineralogy.novaculite_relief_plus": "均密石英岩 加上救济", - "block.mineralogy.novaculite_relief_right": "均密石英岩 正确的救济", - "block.mineralogy.novaculite_relief_sword": "均密石英岩 剑救济", - "block.mineralogy.novaculite_relief_vertical": "均密石英岩 垂直救济", - "advancements.mineralogy.all_the_rocks.title": "呼叫岩石卢多！", - "advancements.mineralogy.all_the_rocks.description": "哇，您已经找到了矿物学中的所有标准岩石类型！", - "fluid.mineralogy.crude_oil": "原油", - "block.mineralogy.crude_oil": "原油", - "item.mineralogy.crude_oil_bucket": "原油桶", - "itemGroup.mineralogy.mineralogy": "我的地理", + "block.mineralogy.andesite_relief_axe": "安山岩浮雕（斧）", + "block.mineralogy.andesite_relief_blank": "安山岩浮雕（无图案）", + "block.mineralogy.andesite_relief_cross": "安山岩浮雕（十字）", + "block.mineralogy.andesite_relief_hammer": "安山岩浮雕（锤）", + "block.mineralogy.andesite_relief_hoe": "安山岩浮雕（锄）", + "block.mineralogy.andesite_relief_horizontal": "安山岩浮雕（横纹）", + "block.mineralogy.andesite_relief_i": "安山岩浮雕（I）", + "block.mineralogy.andesite_relief_left": "安山岩浮雕（左纹）", + "block.mineralogy.andesite_relief_pickaxe": "安山岩浮雕（镐）", + "block.mineralogy.andesite_relief_plus": "安山岩浮雕（加号）", + "block.mineralogy.andesite_relief_right": "安山岩浮雕（右纹）", + "block.mineralogy.andesite_relief_sword": "安山岩浮雕（剑）", + "block.mineralogy.andesite_relief_vertical": "安山岩浮雕（竖纹）", + "block.mineralogy.basalt_relief_axe": "玄武岩浮雕（斧）", + "block.mineralogy.basalt_relief_blank": "玄武岩浮雕（无图案）", + "block.mineralogy.basalt_relief_cross": "玄武岩浮雕（十字）", + "block.mineralogy.basalt_relief_hammer": "玄武岩浮雕（锤）", + "block.mineralogy.basalt_relief_hoe": "玄武岩浮雕（锄）", + "block.mineralogy.basalt_relief_horizontal": "玄武岩浮雕（横纹）", + "block.mineralogy.basalt_relief_i": "玄武岩浮雕（I）", + "block.mineralogy.basalt_relief_left": "玄武岩浮雕（左纹）", + "block.mineralogy.basalt_relief_pickaxe": "玄武岩浮雕（镐）", + "block.mineralogy.basalt_relief_plus": "玄武岩浮雕（加号）", + "block.mineralogy.basalt_relief_right": "玄武岩浮雕（右纹）", + "block.mineralogy.basalt_relief_sword": "玄武岩浮雕（剑）", + "block.mineralogy.basalt_relief_vertical": "玄武岩浮雕（竖纹）", + "block.mineralogy.diorite_relief_axe": "闪长岩浮雕（斧）", + "block.mineralogy.diorite_relief_blank": "闪长岩浮雕（无图案）", + "block.mineralogy.diorite_relief_cross": "闪长岩浮雕（十字）", + "block.mineralogy.diorite_relief_hammer": "闪长岩浮雕（锤）", + "block.mineralogy.diorite_relief_hoe": "闪长岩浮雕（锄）", + "block.mineralogy.diorite_relief_horizontal": "闪长岩浮雕（横纹）", + "block.mineralogy.diorite_relief_i": "闪长岩浮雕（I）", + "block.mineralogy.diorite_relief_left": "闪长岩浮雕（左纹）", + "block.mineralogy.diorite_relief_pickaxe": "闪长岩浮雕（镐）", + "block.mineralogy.diorite_relief_plus": "闪长岩浮雕（加号）", + "block.mineralogy.diorite_relief_right": "闪长岩浮雕（右纹）", + "block.mineralogy.diorite_relief_sword": "闪长岩浮雕（剑）", + "block.mineralogy.diorite_relief_vertical": "闪长岩浮雕（竖纹）", + "block.mineralogy.granite_relief_axe": "花岗岩浮雕（斧）", + "block.mineralogy.granite_relief_blank": "花岗岩浮雕（无图案）", + "block.mineralogy.granite_relief_cross": "花岗岩浮雕（十字）", + "block.mineralogy.granite_relief_hammer": "花岗岩浮雕（锤）", + "block.mineralogy.granite_relief_hoe": "花岗岩浮雕（锄）", + "block.mineralogy.granite_relief_horizontal": "花岗岩浮雕（横纹）", + "block.mineralogy.granite_relief_i": "花岗岩浮雕（I）", + "block.mineralogy.granite_relief_left": "花岗岩浮雕（左纹）", + "block.mineralogy.granite_relief_pickaxe": "花岗岩浮雕（镐）", + "block.mineralogy.granite_relief_plus": "花岗岩浮雕（加号）", + "block.mineralogy.granite_relief_right": "花岗岩浮雕（右纹）", + "block.mineralogy.granite_relief_sword": "花岗岩浮雕（剑）", + "block.mineralogy.granite_relief_vertical": "花岗岩浮雕（竖纹）", + "block.mineralogy.rhyolite_relief_axe": "流纹岩浮雕（斧）", + "block.mineralogy.rhyolite_relief_blank": "流纹岩浮雕（无图案）", + "block.mineralogy.rhyolite_relief_cross": "流纹岩浮雕（十字）", + "block.mineralogy.rhyolite_relief_hammer": "流纹岩浮雕（锤）", + "block.mineralogy.rhyolite_relief_hoe": "流纹岩浮雕（锄）", + "block.mineralogy.rhyolite_relief_horizontal": "流纹岩浮雕（横纹）", + "block.mineralogy.rhyolite_relief_i": "流纹岩浮雕（I）", + "block.mineralogy.rhyolite_relief_left": "流纹岩浮雕（左纹）", + "block.mineralogy.rhyolite_relief_pickaxe": "流纹岩浮雕（镐）", + "block.mineralogy.rhyolite_relief_plus": "流纹岩浮雕（加号）", + "block.mineralogy.rhyolite_relief_right": "流纹岩浮雕（右纹）", + "block.mineralogy.rhyolite_relief_sword": "流纹岩浮雕（剑）", + "block.mineralogy.rhyolite_relief_vertical": "流纹岩浮雕（竖纹）", + "block.mineralogy.pegmatite_relief_axe": "伟晶岩浮雕（斧）", + "block.mineralogy.pegmatite_relief_blank": "伟晶岩浮雕（无图案）", + "block.mineralogy.pegmatite_relief_cross": "伟晶岩浮雕（十字）", + "block.mineralogy.pegmatite_relief_hammer": "伟晶岩浮雕（锤）", + "block.mineralogy.pegmatite_relief_hoe": "伟晶岩浮雕（锄）", + "block.mineralogy.pegmatite_relief_horizontal": "伟晶岩浮雕（横纹）", + "block.mineralogy.pegmatite_relief_i": "伟晶岩浮雕（I）", + "block.mineralogy.pegmatite_relief_left": "伟晶岩浮雕（左纹）", + "block.mineralogy.pegmatite_relief_pickaxe": "伟晶岩浮雕（镐）", + "block.mineralogy.pegmatite_relief_plus": "伟晶岩浮雕（加号）", + "block.mineralogy.pegmatite_relief_right": "伟晶岩浮雕（右纹）", + "block.mineralogy.pegmatite_relief_sword": "伟晶岩浮雕（剑）", + "block.mineralogy.pegmatite_relief_vertical": "伟晶岩浮雕（竖纹）", + "block.mineralogy.shale_relief_axe": "页岩浮雕（斧）", + "block.mineralogy.shale_relief_blank": "页岩浮雕（无图案）", + "block.mineralogy.shale_relief_cross": "页岩浮雕（十字）", + "block.mineralogy.shale_relief_hammer": "页岩浮雕（锤）", + "block.mineralogy.shale_relief_hoe": "页岩浮雕（锄）", + "block.mineralogy.shale_relief_horizontal": "页岩浮雕（横纹）", + "block.mineralogy.shale_relief_i": "页岩浮雕（I）", + "block.mineralogy.shale_relief_left": "页岩浮雕（左纹）", + "block.mineralogy.shale_relief_pickaxe": "页岩浮雕（镐）", + "block.mineralogy.shale_relief_plus": "页岩浮雕（加号）", + "block.mineralogy.shale_relief_right": "页岩浮雕（右纹）", + "block.mineralogy.shale_relief_sword": "页岩浮雕（剑）", + "block.mineralogy.shale_relief_vertical": "页岩浮雕（竖纹）", + "block.mineralogy.conglomerate_relief_axe": "砾岩浮雕（斧）", + "block.mineralogy.conglomerate_relief_blank": "砾岩浮雕（无图案）", + "block.mineralogy.conglomerate_relief_cross": "砾岩浮雕（十字）", + "block.mineralogy.conglomerate_relief_hammer": "砾岩浮雕（锤）", + "block.mineralogy.conglomerate_relief_hoe": "砾岩浮雕（锄）", + "block.mineralogy.conglomerate_relief_horizontal": "砾岩浮雕（横纹）", + "block.mineralogy.conglomerate_relief_i": "砾岩浮雕（I）", + "block.mineralogy.conglomerate_relief_left": "砾岩浮雕（左纹）", + "block.mineralogy.conglomerate_relief_pickaxe": "砾岩浮雕（镐）", + "block.mineralogy.conglomerate_relief_plus": "砾岩浮雕（加号）", + "block.mineralogy.conglomerate_relief_right": "砾岩浮雕（右纹）", + "block.mineralogy.conglomerate_relief_sword": "砾岩浮雕（剑）", + "block.mineralogy.conglomerate_relief_vertical": "砾岩浮雕（竖纹）", + "block.mineralogy.dolomite_relief_axe": "白云岩浮雕（斧）", + "block.mineralogy.dolomite_relief_blank": "白云岩浮雕（无图案）", + "block.mineralogy.dolomite_relief_cross": "白云岩浮雕（十字）", + "block.mineralogy.dolomite_relief_hammer": "白云岩浮雕（锤）", + "block.mineralogy.dolomite_relief_hoe": "白云岩浮雕（锄）", + "block.mineralogy.dolomite_relief_horizontal": "白云岩浮雕（横纹）", + "block.mineralogy.dolomite_relief_i": "白云岩浮雕（I）", + "block.mineralogy.dolomite_relief_left": "白云岩浮雕（左纹）", + "block.mineralogy.dolomite_relief_pickaxe": "白云岩浮雕（镐）", + "block.mineralogy.dolomite_relief_plus": "白云岩浮雕（加号）", + "block.mineralogy.dolomite_relief_right": "白云岩浮雕（右纹）", + "block.mineralogy.dolomite_relief_sword": "白云岩浮雕（剑）", + "block.mineralogy.dolomite_relief_vertical": "白云岩浮雕（竖纹）", + "block.mineralogy.limestone_relief_axe": "石灰石浮雕（斧）", + "block.mineralogy.limestone_relief_blank": "石灰石浮雕（无图案）", + "block.mineralogy.limestone_relief_cross": "石灰石浮雕（十字）", + "block.mineralogy.limestone_relief_hammer": "石灰石浮雕（锤）", + "block.mineralogy.limestone_relief_hoe": "石灰石浮雕（锄）", + "block.mineralogy.limestone_relief_horizontal": "石灰石浮雕（横纹）", + "block.mineralogy.limestone_relief_i": "石灰石浮雕（I）", + "block.mineralogy.limestone_relief_left": "石灰石浮雕（左纹）", + "block.mineralogy.limestone_relief_pickaxe": "石灰石浮雕（镐）", + "block.mineralogy.limestone_relief_plus": "石灰石浮雕（加号）", + "block.mineralogy.limestone_relief_right": "石灰石浮雕（右纹）", + "block.mineralogy.limestone_relief_sword": "石灰石浮雕（剑）", + "block.mineralogy.limestone_relief_vertical": "石灰石浮雕（竖纹）", + "block.mineralogy.marble_relief_axe": "大理石浮雕（斧）", + "block.mineralogy.marble_relief_blank": "大理石浮雕（无图案）", + "block.mineralogy.marble_relief_cross": "大理石浮雕（十字）", + "block.mineralogy.marble_relief_hammer": "大理石浮雕（锤）", + "block.mineralogy.marble_relief_hoe": "大理石浮雕（锄）", + "block.mineralogy.marble_relief_horizontal": "大理石浮雕（横纹）", + "block.mineralogy.marble_relief_i": "大理石浮雕（I）", + "block.mineralogy.marble_relief_left": "大理石浮雕（左纹）", + "block.mineralogy.marble_relief_pickaxe": "大理石浮雕（镐）", + "block.mineralogy.marble_relief_plus": "大理石浮雕（加号）", + "block.mineralogy.marble_relief_right": "大理石浮雕（右纹）", + "block.mineralogy.marble_relief_sword": "大理石浮雕（剑）", + "block.mineralogy.marble_relief_vertical": "大理石浮雕（竖纹）", + "block.mineralogy.slate_relief_axe": "板岩浮雕（斧）", + "block.mineralogy.slate_relief_blank": "板岩浮雕（无图案）", + "block.mineralogy.slate_relief_cross": "板岩浮雕（十字）", + "block.mineralogy.slate_relief_hammer": "板岩浮雕（锤）", + "block.mineralogy.slate_relief_hoe": "板岩浮雕（锄）", + "block.mineralogy.slate_relief_horizontal": "板岩浮雕（横纹）", + "block.mineralogy.slate_relief_i": "板岩浮雕（I）", + "block.mineralogy.slate_relief_left": "板岩浮雕（左纹）", + "block.mineralogy.slate_relief_pickaxe": "板岩浮雕（镐）", + "block.mineralogy.slate_relief_plus": "板岩浮雕（加号）", + "block.mineralogy.slate_relief_right": "板岩浮雕（右纹）", + "block.mineralogy.slate_relief_sword": "板岩浮雕（剑）", + "block.mineralogy.slate_relief_vertical": "板岩浮雕（竖纹）", + "block.mineralogy.schist_relief_axe": "片岩浮雕（斧）", + "block.mineralogy.schist_relief_blank": "片岩浮雕（无图案）", + "block.mineralogy.schist_relief_cross": "片岩浮雕（十字）", + "block.mineralogy.schist_relief_hammer": "片岩浮雕（锤）", + "block.mineralogy.schist_relief_hoe": "片岩浮雕（锄）", + "block.mineralogy.schist_relief_horizontal": "片岩浮雕（横纹）", + "block.mineralogy.schist_relief_i": "片岩浮雕（I）", + "block.mineralogy.schist_relief_left": "片岩浮雕（左纹）", + "block.mineralogy.schist_relief_pickaxe": "片岩浮雕（镐）", + "block.mineralogy.schist_relief_plus": "片岩浮雕（加号）", + "block.mineralogy.schist_relief_right": "片岩浮雕（右纹）", + "block.mineralogy.schist_relief_sword": "片岩浮雕（剑）", + "block.mineralogy.schist_relief_vertical": "片岩浮雕（竖纹）", + "block.mineralogy.gneiss_relief_axe": "片麻岩浮雕（斧）", + "block.mineralogy.gneiss_relief_blank": "片麻岩浮雕（无图案）", + "block.mineralogy.gneiss_relief_cross": "片麻岩浮雕（十字）", + "block.mineralogy.gneiss_relief_hammer": "片麻岩浮雕（锤）", + "block.mineralogy.gneiss_relief_hoe": "片麻岩浮雕（锄）", + "block.mineralogy.gneiss_relief_horizontal": "片麻岩浮雕（横纹）", + "block.mineralogy.gneiss_relief_i": "片麻岩浮雕（I）", + "block.mineralogy.gneiss_relief_left": "片麻岩浮雕（左纹）", + "block.mineralogy.gneiss_relief_pickaxe": "片麻岩浮雕（镐）", + "block.mineralogy.gneiss_relief_plus": "片麻岩浮雕（加号）", + "block.mineralogy.gneiss_relief_right": "片麻岩浮雕（右纹）", + "block.mineralogy.gneiss_relief_sword": "片麻岩浮雕（剑）", + "block.mineralogy.gneiss_relief_vertical": "片麻岩浮雕（竖纹）", + "block.mineralogy.phyllite_relief_axe": "千枚岩浮雕（斧）", + "block.mineralogy.phyllite_relief_blank": "千枚岩浮雕（无图案）", + "block.mineralogy.phyllite_relief_cross": "千枚岩浮雕（十字）", + "block.mineralogy.phyllite_relief_hammer": "千枚岩浮雕（锤）", + "block.mineralogy.phyllite_relief_hoe": "千枚岩浮雕（锄）", + "block.mineralogy.phyllite_relief_horizontal": "千枚岩浮雕（横纹）", + "block.mineralogy.phyllite_relief_i": "千枚岩浮雕（I）", + "block.mineralogy.phyllite_relief_left": "千枚岩浮雕（左纹）", + "block.mineralogy.phyllite_relief_pickaxe": "千枚岩浮雕（镐）", + "block.mineralogy.phyllite_relief_plus": "千枚岩浮雕（加号）", + "block.mineralogy.phyllite_relief_right": "千枚岩浮雕（右纹）", + "block.mineralogy.phyllite_relief_sword": "千枚岩浮雕（剑）", + "block.mineralogy.phyllite_relief_vertical": "千枚岩浮雕（竖纹）", + "block.mineralogy.amphibolite_relief_axe": "角闪岩浮雕（斧）", + "block.mineralogy.amphibolite_relief_blank": "角闪岩浮雕（无图案）", + "block.mineralogy.amphibolite_relief_cross": "角闪岩浮雕（十字）", + "block.mineralogy.amphibolite_relief_hammer": "角闪岩浮雕（锤）", + "block.mineralogy.amphibolite_relief_hoe": "角闪岩浮雕（锄）", + "block.mineralogy.amphibolite_relief_horizontal": "角闪岩浮雕（横纹）", + "block.mineralogy.amphibolite_relief_i": "角闪岩浮雕（I）", + "block.mineralogy.amphibolite_relief_left": "角闪岩浮雕（左纹）", + "block.mineralogy.amphibolite_relief_pickaxe": "角闪岩浮雕（镐）", + "block.mineralogy.amphibolite_relief_plus": "角闪岩浮雕（加号）", + "block.mineralogy.amphibolite_relief_right": "角闪岩浮雕（右纹）", + "block.mineralogy.amphibolite_relief_sword": "角闪岩浮雕（剑）", + "block.mineralogy.amphibolite_relief_vertical": "角闪岩浮雕（竖纹）", + "block.mineralogy.diabase_relief_axe": "辉绿岩浮雕（斧）", + "block.mineralogy.diabase_relief_blank": "辉绿岩浮雕（无图案）", + "block.mineralogy.diabase_relief_cross": "辉绿岩浮雕（十字）", + "block.mineralogy.diabase_relief_hammer": "辉绿岩浮雕（锤）", + "block.mineralogy.diabase_relief_hoe": "辉绿岩浮雕（锄）", + "block.mineralogy.diabase_relief_horizontal": "辉绿岩浮雕（横纹）", + "block.mineralogy.diabase_relief_i": "辉绿岩浮雕（I）", + "block.mineralogy.diabase_relief_left": "辉绿岩浮雕（左纹）", + "block.mineralogy.diabase_relief_pickaxe": "辉绿岩浮雕（镐）", + "block.mineralogy.diabase_relief_plus": "辉绿岩浮雕（加号）", + "block.mineralogy.diabase_relief_right": "辉绿岩浮雕（右纹）", + "block.mineralogy.diabase_relief_sword": "辉绿岩浮雕（剑）", + "block.mineralogy.diabase_relief_vertical": "辉绿岩浮雕（竖纹）", + "block.mineralogy.gabbro_relief_axe": "辉长岩浮雕（斧）", + "block.mineralogy.gabbro_relief_blank": "辉长岩浮雕（无图案）", + "block.mineralogy.gabbro_relief_cross": "辉长岩浮雕（十字）", + "block.mineralogy.gabbro_relief_hammer": "辉长岩浮雕（锤）", + "block.mineralogy.gabbro_relief_hoe": "辉长岩浮雕（锄）", + "block.mineralogy.gabbro_relief_horizontal": "辉长岩浮雕（横纹）", + "block.mineralogy.gabbro_relief_i": "辉长岩浮雕（I）", + "block.mineralogy.gabbro_relief_left": "辉长岩浮雕（左纹）", + "block.mineralogy.gabbro_relief_pickaxe": "辉长岩浮雕（镐）", + "block.mineralogy.gabbro_relief_plus": "辉长岩浮雕（加号）", + "block.mineralogy.gabbro_relief_right": "辉长岩浮雕（右纹）", + "block.mineralogy.gabbro_relief_sword": "辉长岩浮雕（剑）", + "block.mineralogy.gabbro_relief_vertical": "辉长岩浮雕（竖纹）", + "block.mineralogy.peridotite_relief_axe": "橄榄岩浮雕（斧）", + "block.mineralogy.peridotite_relief_blank": "橄榄岩浮雕（无图案）", + "block.mineralogy.peridotite_relief_cross": "橄榄岩浮雕（十字）", + "block.mineralogy.peridotite_relief_hammer": "橄榄岩浮雕（锤）", + "block.mineralogy.peridotite_relief_hoe": "橄榄岩浮雕（锄）", + "block.mineralogy.peridotite_relief_horizontal": "橄榄岩浮雕（横纹）", + "block.mineralogy.peridotite_relief_i": "橄榄岩浮雕（I）", + "block.mineralogy.peridotite_relief_left": "橄榄岩浮雕（左纹）", + "block.mineralogy.peridotite_relief_pickaxe": "橄榄岩浮雕（镐）", + "block.mineralogy.peridotite_relief_plus": "橄榄岩浮雕（加号）", + "block.mineralogy.peridotite_relief_right": "橄榄岩浮雕（右纹）", + "block.mineralogy.peridotite_relief_sword": "橄榄岩浮雕（剑）", + "block.mineralogy.peridotite_relief_vertical": "橄榄岩浮雕（竖纹）", + "block.mineralogy.basaltic_glass_relief_axe": "玄武岩质玻璃浮雕（斧）", + "block.mineralogy.basaltic_glass_relief_blank": "玄武岩质玻璃浮雕（无图案）", + "block.mineralogy.basaltic_glass_relief_cross": "玄武岩质玻璃浮雕（十字）", + "block.mineralogy.basaltic_glass_relief_hammer": "玄武岩质玻璃浮雕（锤）", + "block.mineralogy.basaltic_glass_relief_hoe": "玄武岩质玻璃浮雕（锄）", + "block.mineralogy.basaltic_glass_relief_horizontal": "玄武岩质玻璃浮雕（横纹）", + "block.mineralogy.basaltic_glass_relief_i": "玄武岩质玻璃浮雕（I）", + "block.mineralogy.basaltic_glass_relief_left": "玄武岩质玻璃浮雕（左纹）", + "block.mineralogy.basaltic_glass_relief_pickaxe": "玄武岩质玻璃浮雕（镐）", + "block.mineralogy.basaltic_glass_relief_plus": "玄武岩质玻璃浮雕（加号）", + "block.mineralogy.basaltic_glass_relief_right": "玄武岩质玻璃浮雕（右纹）", + "block.mineralogy.basaltic_glass_relief_sword": "玄武岩质玻璃浮雕（剑）", + "block.mineralogy.basaltic_glass_relief_vertical": "玄武岩质玻璃浮雕（竖纹）", + "block.mineralogy.scoria_relief_axe": "火山渣浮雕（斧）", + "block.mineralogy.scoria_relief_blank": "火山渣浮雕（无图案）", + "block.mineralogy.scoria_relief_cross": "火山渣浮雕（十字）", + "block.mineralogy.scoria_relief_hammer": "火山渣浮雕（锤）", + "block.mineralogy.scoria_relief_hoe": "火山渣浮雕（锄）", + "block.mineralogy.scoria_relief_horizontal": "火山渣浮雕（横纹）", + "block.mineralogy.scoria_relief_i": "火山渣浮雕（I）", + "block.mineralogy.scoria_relief_left": "火山渣浮雕（左纹）", + "block.mineralogy.scoria_relief_pickaxe": "火山渣浮雕（镐）", + "block.mineralogy.scoria_relief_plus": "火山渣浮雕（加号）", + "block.mineralogy.scoria_relief_right": "火山渣浮雕（右纹）", + "block.mineralogy.scoria_relief_sword": "火山渣浮雕（剑）", + "block.mineralogy.scoria_relief_vertical": "火山渣浮雕（竖纹）", + "block.mineralogy.tuff_relief_axe": "凝灰岩浮雕（斧）", + "block.mineralogy.tuff_relief_blank": "凝灰岩浮雕（无图案）", + "block.mineralogy.tuff_relief_cross": "凝灰岩浮雕（十字）", + "block.mineralogy.tuff_relief_hammer": "凝灰岩浮雕（锤）", + "block.mineralogy.tuff_relief_hoe": "凝灰岩浮雕（锄）", + "block.mineralogy.tuff_relief_horizontal": "凝灰岩浮雕（横纹）", + "block.mineralogy.tuff_relief_i": "凝灰岩浮雕（I）", + "block.mineralogy.tuff_relief_left": "凝灰岩浮雕（左纹）", + "block.mineralogy.tuff_relief_pickaxe": "凝灰岩浮雕（镐）", + "block.mineralogy.tuff_relief_plus": "凝灰岩浮雕（加号）", + "block.mineralogy.tuff_relief_right": "凝灰岩浮雕（右纹）", + "block.mineralogy.tuff_relief_sword": "凝灰岩浮雕（剑）", + "block.mineralogy.tuff_relief_vertical": "凝灰岩浮雕（竖纹）", + "block.mineralogy.siltstone_relief_axe": "粉砂岩浮雕（斧）", + "block.mineralogy.siltstone_relief_blank": "粉砂岩浮雕（无图案）", + "block.mineralogy.siltstone_relief_cross": "粉砂岩浮雕（十字）", + "block.mineralogy.siltstone_relief_hammer": "粉砂岩浮雕（锤）", + "block.mineralogy.siltstone_relief_hoe": "粉砂岩浮雕（锄）", + "block.mineralogy.siltstone_relief_horizontal": "粉砂岩浮雕（横纹）", + "block.mineralogy.siltstone_relief_i": "粉砂岩浮雕（I）", + "block.mineralogy.siltstone_relief_left": "粉砂岩浮雕（左纹）", + "block.mineralogy.siltstone_relief_pickaxe": "粉砂岩浮雕（镐）", + "block.mineralogy.siltstone_relief_plus": "粉砂岩浮雕（加号）", + "block.mineralogy.siltstone_relief_right": "粉砂岩浮雕（右纹）", + "block.mineralogy.siltstone_relief_sword": "粉砂岩浮雕（剑）", + "block.mineralogy.siltstone_relief_vertical": "粉砂岩浮雕（竖纹）", + "block.mineralogy.rock_salt_relief_axe": "岩盐浮雕（斧）", + "block.mineralogy.rock_salt_relief_blank": "岩盐浮雕（无图案）", + "block.mineralogy.rock_salt_relief_cross": "岩盐浮雕（十字）", + "block.mineralogy.rock_salt_relief_hammer": "岩盐浮雕（锤）", + "block.mineralogy.rock_salt_relief_hoe": "岩盐浮雕（锄）", + "block.mineralogy.rock_salt_relief_horizontal": "岩盐浮雕（横纹）", + "block.mineralogy.rock_salt_relief_i": "岩盐浮雕（I）", + "block.mineralogy.rock_salt_relief_left": "岩盐浮雕（左纹）", + "block.mineralogy.rock_salt_relief_pickaxe": "岩盐浮雕（镐）", + "block.mineralogy.rock_salt_relief_plus": "岩盐浮雕（加号）", + "block.mineralogy.rock_salt_relief_right": "岩盐浮雕（右纹）", + "block.mineralogy.rock_salt_relief_sword": "岩盐浮雕（剑）", + "block.mineralogy.rock_salt_relief_vertical": "岩盐浮雕（竖纹）", + "block.mineralogy.hornfels_relief_axe": "角岩浮雕（斧）", + "block.mineralogy.hornfels_relief_blank": "角岩浮雕（无图案）", + "block.mineralogy.hornfels_relief_cross": "角岩浮雕（十字）", + "block.mineralogy.hornfels_relief_hammer": "角岩浮雕（锤）", + "block.mineralogy.hornfels_relief_hoe": "角岩浮雕（锄）", + "block.mineralogy.hornfels_relief_horizontal": "角岩浮雕（横纹）", + "block.mineralogy.hornfels_relief_i": "角岩浮雕（I）", + "block.mineralogy.hornfels_relief_left": "角岩浮雕（左纹）", + "block.mineralogy.hornfels_relief_pickaxe": "角岩浮雕（镐）", + "block.mineralogy.hornfels_relief_plus": "角岩浮雕（加号）", + "block.mineralogy.hornfels_relief_right": "角岩浮雕（右纹）", + "block.mineralogy.hornfels_relief_sword": "角岩浮雕（剑）", + "block.mineralogy.hornfels_relief_vertical": "角岩浮雕（竖纹）", + "block.mineralogy.quartzite_relief_axe": "石英岩浮雕（斧）", + "block.mineralogy.quartzite_relief_blank": "石英岩浮雕（无图案）", + "block.mineralogy.quartzite_relief_cross": "石英岩浮雕（十字）", + "block.mineralogy.quartzite_relief_hammer": "石英岩浮雕（锤）", + "block.mineralogy.quartzite_relief_hoe": "石英岩浮雕（锄）", + "block.mineralogy.quartzite_relief_horizontal": "石英岩浮雕（横纹）", + "block.mineralogy.quartzite_relief_i": "石英岩浮雕（I）", + "block.mineralogy.quartzite_relief_left": "石英岩浮雕（左纹）", + "block.mineralogy.quartzite_relief_pickaxe": "石英岩浮雕（镐）", + "block.mineralogy.quartzite_relief_plus": "石英岩浮雕（加号）", + "block.mineralogy.quartzite_relief_right": "石英岩浮雕（右纹）", + "block.mineralogy.quartzite_relief_sword": "石英岩浮雕（剑）", + "block.mineralogy.quartzite_relief_vertical": "石英岩浮雕（竖纹）", + "block.mineralogy.novaculite_relief_axe": "均密石英岩浮雕（斧）", + "block.mineralogy.novaculite_relief_blank": "均密石英岩浮雕（无图案）", + "block.mineralogy.novaculite_relief_cross": "均密石英岩浮雕（十字）", + "block.mineralogy.novaculite_relief_hammer": "均密石英岩浮雕（锤）", + "block.mineralogy.novaculite_relief_hoe": "均密石英岩浮雕（锄）", + "block.mineralogy.novaculite_relief_horizontal": "均密石英岩浮雕（横纹）", + "block.mineralogy.novaculite_relief_i": "均密石英岩浮雕（I）", + "block.mineralogy.novaculite_relief_left": "均密石英岩浮雕（左纹）", + "block.mineralogy.novaculite_relief_pickaxe": "均密石英岩浮雕（镐）", + "block.mineralogy.novaculite_relief_plus": "均密石英岩浮雕（加号）", + "block.mineralogy.novaculite_relief_right": "均密石英岩浮雕（右纹）", + "block.mineralogy.novaculite_relief_sword": "均密石英岩浮雕（剑）", + "block.mineralogy.novaculite_relief_vertical": "均密石英岩浮雕（竖纹）", + "itemGroup.mineralogy.mineralogy": "矿物学", "itemGroup.mineralogy.rock": "矿物学岩石", "itemGroup.mineralogy.stair": "矿物学楼梯", - "itemGroup.mineralogy.slab": "矿物学板", + "itemGroup.mineralogy.slab": "矿物学台阶", "itemGroup.mineralogy.wall": "矿物学墙", - "itemGroup.mineralogy.item": "矿物学项目" + "itemGroup.mineralogy.item": "矿物学物品", + "block.mineralogy.crude_oil": "原油", + "item.mineralogy.crude_oil_bucket": "原油桶", + "fluid.mineralogy.crude_oil": "原油", + "advancements.mineralogy.all_the_rocks.title": "岩石大全", + "advancements.mineralogy.all_the_rocks.description": "你已找到矿物学中的所有标准岩石类型！" } diff --git a/src/main/resources/assets/mineralogy/textures/items/crude_oil_bucket.png b/src/main/resources/assets/mineralogy/textures/items/crude_oil_bucket.png new file mode 100644 index 000000000..0464fc589 Binary files /dev/null and b/src/main/resources/assets/mineralogy/textures/items/crude_oil_bucket.png differ diff --git a/src/main/resources/data/forge/tags/blocks/cobblestone.json b/src/main/resources/data/forge/tags/blocks/cobblestone.json index eccd4a778..4a747bf9a 100644 --- a/src/main/resources/data/forge/tags/blocks/cobblestone.json +++ b/src/main/resources/data/forge/tags/blocks/cobblestone.json @@ -1,32 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite", - "mineralogy:basalt", - "mineralogy:diorite", - "mineralogy:granite", - "mineralogy:rhyolite", - "mineralogy:pegmatite", - "mineralogy:diabase", - "mineralogy:gabbro", - "mineralogy:peridotite", - "mineralogy:basaltic_glass", - "mineralogy:scoria", - "mineralogy:tuff", - "mineralogy:shale", - "mineralogy:conglomerate", - "mineralogy:dolomite", - "mineralogy:limestone", - "mineralogy:siltstone", - "mineralogy:marble", - "mineralogy:rock_salt", - "mineralogy:slate", - "mineralogy:schist", - "mineralogy:gneiss", - "mineralogy:phyllite", - "mineralogy:amphibolite", - "mineralogy:hornfels", - "mineralogy:quartzite", - "mineralogy:novaculite" + "mineralogy:chert", + "mineralogy:pumice" ] } diff --git a/src/main/resources/data/forge/tags/fluids/crude_oil.json b/src/main/resources/data/forge/tags/fluids/crude_oil.json index 4c871dc8c..e80854f75 100644 --- a/src/main/resources/data/forge/tags/fluids/crude_oil.json +++ b/src/main/resources/data/forge/tags/fluids/crude_oil.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:crude_oil" + "mineralogy:crude_oil", + "mineralogy:flowing_crude_oil" ] } diff --git a/src/main/resources/data/forge/tags/items/cobblestone.json b/src/main/resources/data/forge/tags/items/cobblestone.json index eccd4a778..4a747bf9a 100644 --- a/src/main/resources/data/forge/tags/items/cobblestone.json +++ b/src/main/resources/data/forge/tags/items/cobblestone.json @@ -1,32 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite", - "mineralogy:basalt", - "mineralogy:diorite", - "mineralogy:granite", - "mineralogy:rhyolite", - "mineralogy:pegmatite", - "mineralogy:diabase", - "mineralogy:gabbro", - "mineralogy:peridotite", - "mineralogy:basaltic_glass", - "mineralogy:scoria", - "mineralogy:tuff", - "mineralogy:shale", - "mineralogy:conglomerate", - "mineralogy:dolomite", - "mineralogy:limestone", - "mineralogy:siltstone", - "mineralogy:marble", - "mineralogy:rock_salt", - "mineralogy:slate", - "mineralogy:schist", - "mineralogy:gneiss", - "mineralogy:phyllite", - "mineralogy:amphibolite", - "mineralogy:hornfels", - "mineralogy:quartzite", - "mineralogy:novaculite" + "mineralogy:chert", + "mineralogy:pumice" ] } diff --git a/src/main/resources/data/forge/tags/items/dusts/coal.json b/src/main/resources/data/forge/tags/items/dusts/coal.json new file mode 100644 index 000000000..5d341ba24 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/coal.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} diff --git a/src/main/resources/data/forge/tags/items/paper.json b/src/main/resources/data/forge/tags/items/paper.json new file mode 100644 index 000000000..521196bf4 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/paper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:paper" + ] +} diff --git a/src/main/resources/data/forge/tags/items/sand.json b/src/main/resources/data/forge/tags/items/sand.json new file mode 100644 index 000000000..c2b982eea --- /dev/null +++ b/src/main/resources/data/forge/tags/items/sand.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:sand", + "minecraft:red_sand" + ] +} 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 new file mode 100644 index 000000000..d96be668c --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json @@ -0,0 +1,91 @@ +{ + "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" + ] + ] + } + }, + { + "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" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..ac6e1a203 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json @@ -0,0 +1,91 @@ +{ + "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" + ] + ] + } + }, + { + "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" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..b381f095d --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json @@ -0,0 +1,91 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "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" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "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" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..7dfbc8f07 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json @@ -0,0 +1,91 @@ +{ + "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" + ] + ] + } + }, + { + "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" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..999a12461 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json @@ -0,0 +1,91 @@ +{ + "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" + ] + ] + } + }, + { + "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" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..c201195c4 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json @@ -0,0 +1,50 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_andesite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:andesite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_andesite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_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 new file mode 100644 index 000000000..862f9d9ad --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json @@ -0,0 +1,50 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_basalt" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:basalt" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_basalt" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_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 new file mode 100644 index 000000000..29b9d349d --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json @@ -0,0 +1,50 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_diorite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:diorite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_diorite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_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 new file mode 100644 index 000000000..5c91f2ae2 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json @@ -0,0 +1,50 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_granite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:granite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_granite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_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 new file mode 100644 index 000000000..5adba3e59 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json @@ -0,0 +1,87 @@ +{ + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json new file mode 100644 index 000000000..8a8f9eece --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json @@ -0,0 +1,87 @@ +{ + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json new file mode 100644 index 000000000..11dcab87e --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json @@ -0,0 +1,91 @@ +{ + "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" + ] + ] + } + }, + { + "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" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json new file mode 100644 index 000000000..4b7a1b567 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json @@ -0,0 +1,91 @@ +{ + "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" + ] + ] + } + }, + { + "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" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json new file mode 100644 index 000000000..705902e68 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json @@ -0,0 +1,87 @@ +{ + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json new file mode 100644 index 000000000..4a6eb8715 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json @@ -0,0 +1,91 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "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" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "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" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json new file mode 100644 index 000000000..5360f2d6e --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json @@ -0,0 +1,91 @@ +{ + "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" + ] + ] + } + }, + { + "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" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..0ae57241d --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json @@ -0,0 +1,87 @@ +{ + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..435cbdf03 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json @@ -0,0 +1,87 @@ +{ + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..d4febc9f7 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json @@ -0,0 +1,87 @@ +{ + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} 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 new file mode 100644 index 000000000..54d8ec221 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json @@ -0,0 +1,87 @@ +{ + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "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" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/andesite.json b/src/main/resources/data/minecraft/recipes/andesite.json index 915a7f1cd..e51cdd8cb 100644 --- a/src/main/resources/data/minecraft/recipes/andesite.json +++ b/src/main/resources/data/minecraft/recipes/andesite.json @@ -1,15 +1,54 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diorite" - }, - { - "tag": "forge:cobblestone" - } - ], - "result": { - "item": "minecraft:andesite", - "count": 2 - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "tag": "mineralogy:cobblestone_equivalents" + } + ], + "result": { + "item": "minecraft:andesite", + "count": 2 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "tag": "forge:cobblestone" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..83c96a134 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/andesite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:andesite" + } + }, + "result": { + "item": "minecraft:andesite_slab", + "count": 6 + } + } + } + ] +} 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 new file mode 100644 index 000000000..31a74d211 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "mineralogy:andesite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/brewing_stand.json b/src/main/resources/data/minecraft/recipes/brewing_stand.json new file mode 100644 index 000000000..492aaaad8 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/brewing_stand.json @@ -0,0 +1,60 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " B ", + "###" + ], + "key": { + "B": { + "item": "minecraft:blaze_rod" + }, + "#": { + "tag": "mineralogy:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:brewing_stand" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " B ", + "###" + ], + "key": { + "B": { + "item": "minecraft:blaze_rod" + }, + "#": { + "tag": "minecraft:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:brewing_stand" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/diorite.json b/src/main/resources/data/minecraft/recipes/diorite.json index c736018d3..36069945d 100644 --- a/src/main/resources/data/minecraft/recipes/diorite.json +++ b/src/main/resources/data/minecraft/recipes/diorite.json @@ -1,19 +1,62 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "CQ", - "QC" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "C": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:diorite", - "count": 2 - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "CQ", + "QC" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "C": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:diorite", + "count": 2 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "CQ", + "QC" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "C": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:diorite", + "count": 2 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/diorite_slab.json b/src/main/resources/data/minecraft/recipes/diorite_slab.json new file mode 100644 index 000000000..d82220d8a --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/diorite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:diorite" + } + }, + "result": { + "item": "minecraft:diorite_slab", + "count": 6 + } + } + } + ] +} 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 new file mode 100644 index 000000000..7718a7213 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "mineralogy:diorite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/dispenser.json b/src/main/resources/data/minecraft/recipes/dispenser.json index e010879a3..456aa9adb 100644 --- a/src/main/resources/data/minecraft/recipes/dispenser.json +++ b/src/main/resources/data/minecraft/recipes/dispenser.json @@ -1,22 +1,68 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - }, - "X": { - "item": "minecraft:bow" - } - }, - "result": { - "item": "minecraft:dispenser" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "X": { + "item": "minecraft:bow" + } + }, + "result": { + "item": "minecraft:dispenser" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + }, + "X": { + "item": "minecraft:bow" + } + }, + "result": { + "item": "minecraft:dispenser" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/dropper.json b/src/main/resources/data/minecraft/recipes/dropper.json index 437c22cf6..2d027e2d9 100644 --- a/src/main/resources/data/minecraft/recipes/dropper.json +++ b/src/main/resources/data/minecraft/recipes/dropper.json @@ -1,19 +1,62 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:dropper" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:dropper" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:dropper" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/furnace.json b/src/main/resources/data/minecraft/recipes/furnace.json index 69998c5fd..6815bb49c 100644 --- a/src/main/resources/data/minecraft/recipes/furnace.json +++ b/src/main/resources/data/minecraft/recipes/furnace.json @@ -1,16 +1,56 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "###" - ], - "key": { - "#": { - "tag": "mineralogy:vanilla_furnace_materials" - } - }, - "result": { - "item": "minecraft:furnace" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": { + "tag": "mineralogy:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:furnace" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": { + "tag": "minecraft:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:furnace" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/granite_slab.json b/src/main/resources/data/minecraft/recipes/granite_slab.json new file mode 100644 index 000000000..398cc2df4 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/granite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:granite" + } + }, + "result": { + "item": "mineralogy:granite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:granite" + } + }, + "result": { + "item": "minecraft:granite_slab", + "count": 6 + } + } + } + ] +} 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 new file mode 100644 index 000000000..318e4db08 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "mineralogy:granite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/lever.json b/src/main/resources/data/minecraft/recipes/lever.json index 2d346f1d9..3cb1ea872 100644 --- a/src/main/resources/data/minecraft/recipes/lever.json +++ b/src/main/resources/data/minecraft/recipes/lever.json @@ -1,18 +1,60 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#" - ], - "key": { - "#": { - "tag": "forge:cobblestone" - }, - "X": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "minecraft:lever" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#" + ], + "key": { + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "X": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:lever" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#" + ], + "key": { + "#": { + "tag": "forge:cobblestone" + }, + "X": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:lever" + } + } + } + ] } 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 209c9a281..7749dbfa8 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 @@ -1,15 +1,54 @@ { - "type": "minecraft:crafting_shapeless", - "group": "mossy_cobblestone", - "ingredients": [ - { - "tag": "forge:cobblestone" - }, - { - "item": "minecraft:moss_block" - } - ], - "result": { - "item": "minecraft:mossy_cobblestone" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "mineralogy:cobblestone_equivalents" + }, + { + "item": "minecraft:moss_block" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "forge:cobblestone" + }, + { + "item": "minecraft:moss_block" + } + ], + "result": { + "item": "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 aaa7ff7be..d99d8314c 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 @@ -1,15 +1,54 @@ { - "type": "minecraft:crafting_shapeless", - "group": "mossy_cobblestone", - "ingredients": [ - { - "tag": "forge:cobblestone" - }, - { - "item": "minecraft:vine" - } - ], - "result": { - "item": "minecraft:mossy_cobblestone" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "mineralogy:cobblestone_equivalents" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "forge:cobblestone" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/observer.json b/src/main/resources/data/minecraft/recipes/observer.json index 462665e45..cf5dee25e 100644 --- a/src/main/resources/data/minecraft/recipes/observer.json +++ b/src/main/resources/data/minecraft/recipes/observer.json @@ -1,22 +1,68 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "RRQ", - "###" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:observer" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "RRQ", + "###" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:observer" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "RRQ", + "###" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:observer" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/piston.json b/src/main/resources/data/minecraft/recipes/piston.json index a76f23df6..7ff6271de 100644 --- a/src/main/resources/data/minecraft/recipes/piston.json +++ b/src/main/resources/data/minecraft/recipes/piston.json @@ -1,25 +1,74 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "TTT", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - }, - "T": { - "tag": "minecraft:planks" - }, - "X": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "minecraft:piston" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "T": { + "tag": "minecraft:planks" + }, + "X": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "minecraft:piston" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + }, + "T": { + "tag": "minecraft:planks" + }, + "X": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "minecraft:piston" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite.json b/src/main/resources/data/minecraft/recipes/polished_andesite.json new file mode 100644 index 000000000..362310f4a --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:andesite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..47dd4edf6 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_andesite" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_andesite" + } + }, + "result": { + "item": "minecraft:polished_andesite_slab", + "count": 6 + } + } + } + ] +} 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 new file mode 100644 index 000000000..154525a4e --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "mineralogy:andesite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} 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 new file mode 100644 index 000000000..694788bb6 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "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 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_basalt.json b/src/main/resources/data/minecraft/recipes/polished_basalt.json new file mode 100644 index 000000000..5d4f6ee5e --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_basalt.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:basalt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..cec14689a --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..41f6487f8 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_diorite" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_diorite" + } + }, + "result": { + "item": "minecraft:polished_diorite_slab", + "count": 6 + } + } + } + ] +} 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 new file mode 100644 index 000000000..2dc3ffbc8 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "mineralogy:diorite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} 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 new file mode 100644 index 000000000..d96c5fa9d --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "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 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_granite.json b/src/main/resources/data/minecraft/recipes/polished_granite.json new file mode 100644 index 000000000..5edeb5a84 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:granite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..56beae068 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_granite" + } + }, + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_granite" + } + }, + "result": { + "item": "minecraft:polished_granite_slab", + "count": 6 + } + } + } + ] +} 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 new file mode 100644 index 000000000..bf8e93316 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "mineralogy:granite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} 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 new file mode 100644 index 000000000..c3fe951d0 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "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 + } + }, + { + "conditions": [ + { + "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 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone.json b/src/main/resources/data/minecraft/recipes/stone.json deleted file mode 100644 index 7d64bde64..000000000 --- a/src/main/resources/data/minecraft/recipes/stone.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:cobblestone" - }, - "result": "minecraft:stone", - "experience": 0.1, - "cookingtime": 200 -} diff --git a/src/main/resources/data/minecraft/recipes/stone_axe.json b/src/main/resources/data/minecraft/recipes/stone_axe.json new file mode 100644 index 000000000..d56421e42 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_axe.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "X#", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_axe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "X#", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_axe" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_hoe.json b/src/main/resources/data/minecraft/recipes/stone_hoe.json new file mode 100644 index 000000000..d42d22cb4 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_hoe.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " #", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_hoe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " #", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_hoe" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_pickaxe.json b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json new file mode 100644 index 000000000..9ceee3d7b --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " # ", + " # " + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_pickaxe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " # ", + " # " + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_pickaxe" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_shovel.json b/src/main/resources/data/minecraft/recipes/stone_shovel.json new file mode 100644 index 000000000..21d1d2c1b --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_shovel.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_shovel" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_shovel" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_sword.json b/src/main/resources/data/minecraft/recipes/stone_sword.json new file mode 100644 index 000000000..19d45c5d6 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_sword.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_sword" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_sword" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/tags/blocks/base_stone_overworld.json b/src/main/resources/data/minecraft/tags/blocks/base_stone_overworld.json deleted file mode 100644 index 530abc167..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/base_stone_overworld.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#mineralogy:rocks", - "minecraft:andesite", - "minecraft:basalt", - "minecraft:diorite", - "minecraft:granite", - "minecraft:tuff" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/deepslate_ore_replaceables.json b/src/main/resources/data/minecraft/tags/blocks/deepslate_ore_replaceables.json deleted file mode 100644 index bd19e59b4..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/deepslate_ore_replaceables.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#mineralogy:rocks" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index fe63bb051..0e34ab988 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,4 +1,4 @@ -{ +{ "replace": false, "values": [ "mineralogy:amphibolite", diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json index b915869ea..a6b25e6cd 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -1,4 +1,4 @@ -{ +{ "replace": false, "values": [ "mineralogy:basalt", diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json index e5a8c8aa7..4a6dbafcf 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -1,4 +1,4 @@ -{ +{ "replace": false, "values": [ "mineralogy:amphibolite", diff --git a/src/main/resources/data/minecraft/tags/blocks/stone_ore_replaceables.json b/src/main/resources/data/minecraft/tags/blocks/stone_ore_replaceables.json deleted file mode 100644 index 530abc167..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/stone_ore_replaceables.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#mineralogy:rocks", - "minecraft:andesite", - "minecraft:basalt", - "minecraft:diorite", - "minecraft:granite", - "minecraft:tuff" - ] -} 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 8d9676560..e334b0b91 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:amphibolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..799daa8f0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 1b184ce18..27173e80e 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:amphibolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a7644bac4..666bfb8e5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:amphibolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..d35bda430 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..509a125c2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 1247f9680..c59d0c4d4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:amphibolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..67dc69180 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 e2e0b0383..e5e2e85d0 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:amphibolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..9b832b0a4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json new file mode 100644 index 000000000..47d16830d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 09a1d9933..4a7002a77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:amphibolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..717770ff3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..aa68f4a42 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ce5e04a79 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e3d85e98f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ed59a87f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c7b5e8b0f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..4c0778f5b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..41c5823d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..375cf06ba --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f4f56e5cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b639d0fc7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..90ec3265f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 323262aa9..edb719955 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 04362210b..dbef3226c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 50e6905e0..39f11b1bd 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7126bc991..9129b338a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ac2aa25d6..64c5827b6 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a585125bb..b4638df74 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 27bbbd821..8b93cd5e0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6e94b26c6..734c1a415 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fa4e75d26..a30d4e8b1 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 68f7949b1..46ece6543 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0315f2c7f..c70ddd243 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 51b1852a4..372d21ca9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 721400da9..0be3d1a51 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f052be64e..71b210815 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:amphibolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6de5e19b4..ba4f39b6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:amphibolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 5f7feb7f7..3920eddd2 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c534f493c..75995a083 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:amphibolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 14a9e5e73..330c79152 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:amphibolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 51155dddc..c211d85bd 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:amphibolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 853220680..a7514ea1f 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:amphibolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ffc08031d..7a059acd7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b65791635..89385854c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 581c76fe2..d475e202c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b0cfbc3ae..e1c0c5f75 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1d2d0977f..a92a06447 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:amphibolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..873844aa5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:amphibolite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 1d0de6bd1..4e23db22c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:amphibolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 158e32221..d6c8754bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:andesite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..af8db5c2c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 353cbbe4c..2a05ff509 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:andesite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 901cb7842..6f635fc61 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:andesite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..ce0d0a87c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..831da7933 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 6c766a9d8..f41e3ea25 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:andesite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..c19c53fd1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 13ff88985..c644b8210 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:andesite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..fe7172659 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json new file mode 100644 index 000000000..89b36f284 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f6df95a18..243f26814 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/andesite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..7f1cc49e2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..fbca5eba0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..56c6467e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..8769b4326 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..321cc0b6c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d464b8e53 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f7d7a2841 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..2b1c606ad --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..3f5bbcd7b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..83bd65279 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0195b869a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..90a41bae4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 b2256859e..2cdf222ce 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 cb57e0387..d3d1a1f81 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ccfc33bc2..6a1074b4f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8dadfb579..c8a7d3290 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2e422bfb5..739fd67b8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 50d4e2c0c..858f1e700 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7362d062f..df27aa16d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7441a6a1f..90b2200f9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2f9ebd123..444b2bc6d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9ef3c95eb..17c3d1e3d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fa5b7488b..8c73f4eb7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6d135dfc1..a485aea95 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ba48997ec..ac9b7ea28 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9da88f5d8..d33e54aea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:andesite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..9d693c9b4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..494014316 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 e16f0a1cd..46d78463a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json @@ -1,31 +1,55 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/andesite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 5ab2ebcfc..cc90f96bb 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7e742af52..b94fe2ae4 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:andesite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 629c493f5..7edf12360 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:andesite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f5cf7e7cf..f4f70b7c8 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:andesite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8ee512a65..4acd60a59 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:andesite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b5961e633..1ae828cc7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b872071aa..8ca880d5f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..86eb6fdc2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..15eba1603 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 372fd72ab..f5286e5b0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9a2528370..b92eb9b73 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 68d1e3ef9..7bc6cd011 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:andesite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..8979aa47a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:andesite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 9972efc56..e69afdf71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:andesite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1f4e56e75..0cf45f217 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basalt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..bf7333669 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 cb9e93215..292e085be 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basalt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b4bdefbd0..524076659 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basalt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..3c499418b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..d11bae02f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 8c4b69e6a..862c1c3b4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basalt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..23e9a466a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 1b7943e59..c5f9fafe1 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basalt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..eb530a869 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json new file mode 100644 index 000000000..246f456a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 b30dbb82b..75937e579 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..d2b5d1dbb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..7dc4626fc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6930f8371 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b6288b53d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ec0fa0853 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d1215cf76 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..5ad5507d2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b13fcae2d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ff2060f7c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..b25a3b5e2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..2d9d0b1f7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..0d9e63023 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 3b04680c8..f2b1ecbaf 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ee98a2e05..68da9a9a2 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8b56b1ba3..a0f660f0e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f3813531e..3fc99847a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d5c5f1fae..afb006861 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 65bef0b89..5a7c94034 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 889192489..2e9e67f61 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b0de801c6..93ce1b31c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 41a97512c..3fe245eaa 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 dd586fbae..00beeff1a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ad0f49e25..b410e0d9d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 61546e3e1..bf15eb288 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 57233be6e..76a1f0445 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1bff5cd88..d3b14a55b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 073e271b7..0a1999ddb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json @@ -1,31 +1,55 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 82974b53f..ee1b61c92 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a0d4b7ab2..c99b2c79c 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basalt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 94bd7f4c3..721699f83 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basalt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c93a36155..cdc5fb115 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basalt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 abbaee0f5..e411c5664 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basalt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c1c4fd074..ff71e1011 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 481476792..18282319c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f106b6b1f..c3d3e44f4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e6b8241a2..90b120d0f 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 98ee5afcd..27e4de6c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..179a30eed --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:basalt_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 472ab6913..24eaa7553 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8b1a4444b..780b17fd3 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basaltic_glass" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5ae863fb8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 9aa82fe07..fda3096ea 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basaltic_glass_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2b3189e75..d562f7022 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basaltic_glass_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5ef5fb950 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..812087a4f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 2ec98c6c5..349f965df 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basaltic_glass_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..ac639e88b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 4f5720c63..2a8289b1b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basaltic_glass_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..28db5a95c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..d12c6492c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 863a7d2e9..eaf4e224f 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basaltic_glass" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..4f1864a46 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..2976bcc2b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9a2ca3203 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..86f620075 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..90c1f43b6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..31cd01bf7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..cc740a026 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..95324085f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..46e3365b2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..28c7fb4e4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ca0bd18fa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f29ea4e47 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 013dedde6..9d69141c6 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7646f6ed3..5d4f581ba 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fae1a6df1..6af2838e9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7c975a05d..e4df266f7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a6382ecea..bf38e3b3f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 40abf6f38..8d9eabbb5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4b25f78c4..737c52e38 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 01a71093e..fcc8e188e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c615fc148..ef715c39d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e4fb3ae27..065928510 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 35767b313..738a169b3 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1d900c931..ab2908e03 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e0bb5429a..9fc7c1cfc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0c77843ae..6f6f1d2e3 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,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basaltic_glass" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 42f5df951..b01310221 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,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basaltic_glass" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 1ba455534..6260ef1ba 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b78306a4a..9c7b90f05 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 50b4a48c0..00a32d15a 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 aee697972..1135e2fc8 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bdb85af22..1e5094798 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8392ef825..3ed38d897 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 beb9b7f08..73704445d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f8b2c89b7..848c91460 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4b98b11df..48191f72c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 eb0109941..52c506052 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basaltic_glass" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..8149e515b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f43b6e5a8..dde7d2c5a 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basaltic_glass" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json new file mode 100644 index 000000000..82cb3a5da --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + } + ], + "rewards": { + "recipes": [ + "mineralogy:chalk" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:chalk" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:chalk_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json new file mode 100644 index 000000000..dd7ec4b54 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:chalk_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:chalk_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:chalk" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json new file mode 100644 index 000000000..661a34206 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json @@ -0,0 +1,36 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 8918e8a7d..557cb3073 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:conglomerate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..bbc48c974 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 4b9a53fb6..f3dc4b135 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:conglomerate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a8847515b..1e6c908ba 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:conglomerate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..1491db5b3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..c31adbb2c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f26f13d8c..2c516e81e 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:conglomerate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..0f7a7c2b7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 023faf7f7..6c1530992 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:conglomerate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..07c1a1eef --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json new file mode 100644 index 000000000..15367510d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 66e0579d5..9967001f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:conglomerate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..034b134a8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c1e81d8aa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b740a5f5b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..fcf4afcad --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..470f6460a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e58eee2fa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..733eeee2b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..8d9453823 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..690dcdcaf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..9dda6c981 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..5d1e9f9ff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..45d15c9cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 5c96cccd9..e21a800ce 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fdbd68487..5481a176b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 de30bf39b..58a06f8b4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6c035851b..43ce2705e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3ef7b3dfe..d6a57bb2c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6f7e040d2..bb7b997eb 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5504d8af3..748299029 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 69ca1ff53..729297ac4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9faa30149..03cf0e044 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 38fbb2c87..574ae1052 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e893e6c79..3cd261fa9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c217fc623..60354604b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 802daece1..a3b70e03f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 aa45a5243..68dd161ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:conglomerate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ad22c853c..323ace332 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:conglomerate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 9c5415808..4b7c87668 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a52ae250e..0282b3ec4 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:conglomerate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 16336f112..d39a0a741 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:conglomerate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bd8097fd6..a80ed8ffc 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:conglomerate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a695f5d42..d0f8ddcee 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:conglomerate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 087aedc46..a4a6893b9 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e9fda4933..d28d90041 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 51605d051..0d5d87743 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8b90cd0b7..7932df62a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0b871cf6c..8c38b6600 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:conglomerate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f6669aec1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:conglomerate_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 2e5cfd547..be860e102 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:conglomerate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7216bd271..45db18c85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diabase" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..bfd93b30a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 7614dbdbe..a023abaa1 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diabase_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 31e8eaa3f..569a95235 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diabase_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f21130d98 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..270f3b9c8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 37e3a0a99..1e0f44a18 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diabase_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..6ee40d3cf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 274a85cf2..8b6fdb844 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diabase_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f2798b0ee --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json new file mode 100644 index 000000000..10674be47 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 9fa2a9636..b069ca1ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diabase" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b9a448937 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..1acb95e1a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9d7138d37 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..db7ebb829 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..aeea163a7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..40f8af8de --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f66087c86 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ecb844aa0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6167654fa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..d730f5d82 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..43de03c43 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..559424279 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 ab63e15a2..b577e2f7c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 400dda161..54f843646 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 60ef903a2..738fb5526 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6bb77f1fe..165f35dad 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 473f532f4..03bbb8c43 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 014083053..87fa3b9e2 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bf784564b..7d556019b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0c2fb1f2e..acc777458 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 78301bfcf..cb60d6a90 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6231e8162..7e87a1f2a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 985156ae0..eaa73da3e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 504109a54..a018dc5bc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3a86999f0..0f9d58bae 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 57940d978..4e2bd9ec9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diabase" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6200ae1d8..30264e6fb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diabase" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 9de658506..b6896c5cb 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fe7b3f483..8a4a7e403 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diabase_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 65d2e8a12..06d36ef8e 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diabase_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 914745830..3c71d1bab 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diabase_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f5b7e5017..35428590e 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diabase_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2f8801041..d16a4e86c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a49ecc480..e8b52d7b0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d884cbdda..8d0a44b80 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d2d1c8d47..afb37f795 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7425729ba..0f912f525 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diabase" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..511003942 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:diabase_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 84c4566bd..81429a97d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diabase" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e70964551..942b260d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diorite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..8d2b0a480 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 02be2c429..55b0dd6f9 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diorite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a40e8b23c..2fa5ca687 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diorite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..e0d12026d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..e2088c77c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 28825352b..a9039fb1b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diorite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..032060270 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 c878ced3d..b0152339c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diorite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..e25f8b415 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json new file mode 100644 index 000000000..ac71661ea --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 71bea0fe8..1de614ab6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/diorite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..65f88bb59 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0f3c7675c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..344bf40c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..bbeb6c4eb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..53f7ede73 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e07e2b068 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..2ef28f07e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..045f485ab --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..202a2f231 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..3d3892b48 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..dda07b128 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..ce05762f3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 370332359..6f362d0cc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 04503141a..122e56dd3 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 49203ea3a..0d659dfff 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f87c9e4c3..8869a160b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fdd8e8914..07d163567 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d9a16177e..f85a14c13 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b05541769..fefaf1e51 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 38b007421..1788fb4f2 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 889528443..2a37689ff 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f05531b61..a9115774a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b5f3f1cc3..f31b26375 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 787f42c80..a34396ed0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8b2f88b87..db1bc62e2 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 06ce27b94..bb2ded017 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diorite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..3c36f2d39 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..1ac22aa64 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 2d4b7eabd..b7c9d037b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json @@ -1,31 +1,55 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/diorite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 71a6e2a22..78615b863 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 cc87ad776..c51a15a73 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diorite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 15bdc32f9..d2839007b 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diorite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 588036d7d..e94fd425b 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diorite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9dc3b4796..0846b9e4e 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diorite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ed5312375..5b13e5e72 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6624a5c8d..a0d86b476 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..74245ee06 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..166f2b72d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 5a6afceed..d357fbc26 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3873ad2c7..547c8720a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f5a46389b..2c2b106e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diorite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..929c6a8fe --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:diorite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 b706992bc..132753c99 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diorite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f0ce37ad6..d8732d83b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:dolomite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b8e513a0a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 ecb58858c..fa4daa286 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:dolomite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d9685d37b..58111b867 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:dolomite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..e81d004fa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..a95a6575e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 bc3cb4318..5e0126c42 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:dolomite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..a197470e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 5f5baed43..0b74760be 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:dolomite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..135126763 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json new file mode 100644 index 000000000..1c5351fdc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 83536f798..e32873cfd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:dolomite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..cedab83e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..df321e810 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..332538add --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c748454b6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6a88fb963 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..af6da161e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..7aed24f28 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..597906629 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..282c0e18b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..7abde9274 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..4dbd96265 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..60d45768b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 e5f6e685f..ccf98e0f8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 529184e88..fe8040f88 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 28d14c336..266bd63a8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f25cce443..b8b56c248 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f305bf749..878349d05 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a6fc52663..dd53c6690 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e221aaa7b..8e1d774b4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 76153db6d..6f92ccc23 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fa37dd73a..5db490d9f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9943303db..1fc4a064a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 63ee742b5..1f4acdbcc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a230440f7..27373fb5d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 21528d629..89f8ef82b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b092f3013..b7322cb62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:dolomite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d0894ee02..571e0b918 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:dolomite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 c0dc33ae0..f4f0f9884 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8ec634183..d641877bf 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:dolomite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f7739c494..0523296a2 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:dolomite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 45245d1f0..2287663e3 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:dolomite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 614f7130b..ae55b18d8 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:dolomite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5a7e9b627..b20e9c2a2 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 49d859a2e..8b168d5d9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 91ca22396..003df93ba 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 75e061d25..939ab1b52 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 beda24aa1..0c5cb888e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:dolomite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..c9352ace5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:dolomite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 0660eb134..bdaefc444 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:dolomite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json new file mode 100644 index 000000000..5ff2a4054 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gypsum_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json new file mode 100644 index 000000000..348fc7bc6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_black" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_black" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json new file mode 100644 index 000000000..ab74cddb7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_blue" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_blue" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json new file mode 100644 index 000000000..5a9c32255 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_brown" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_brown" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json new file mode 100644 index 000000000..b0093152d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_cyan" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_cyan" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json new file mode 100644 index 000000000..1ab6e1a9f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_gray" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_gray" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json new file mode 100644 index 000000000..24023c0e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_green" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_green" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6c524e771 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_light_blue" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_light_blue" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json new file mode 100644 index 000000000..fc192f108 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_lime" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_lime" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json new file mode 100644 index 000000000..56fe631e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_magenta" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_magenta" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json new file mode 100644 index 000000000..58899cfcf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_orange" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_orange" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json new file mode 100644 index 000000000..c6cbbc948 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_pink" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_pink" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json new file mode 100644 index 000000000..d6782b4f8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_purple" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_purple" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json new file mode 100644 index 000000000..ffdb88b45 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_red" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_red" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json new file mode 100644 index 000000000..46ad8d88d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_silver" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_silver" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json new file mode 100644 index 000000000..4892ec47a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_white" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_white" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json new file mode 100644 index 000000000..b369d2030 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_yellow" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_yellow" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 5a04e150a..eb7137eb9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gabbro" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b0b2ac0de --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 8d2d580c2..21b48cd9d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gabbro_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bdefec475..775f25e7c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gabbro_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..43907694f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..347d31fc0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 03e0a7782..29c44d73d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gabbro_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..1d2642535 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 7be49016c..d60ecd2ad 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gabbro_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..1bda37c81 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json new file mode 100644 index 000000000..03fe276f2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 803aaa7a7..b9376c7d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gabbro" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2936e3532 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..65f0ba93d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0ae4bdd1e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..974388c61 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b25aeacb7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..cb74810c2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..d6bf037a4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d23ca1ddc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..03884bb0d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..0ed984e92 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6d4ff6e3d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..e3889361b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 433d3af85..8b69c72ef 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6d6d3e0ac..3d32b1951 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bab921518..bb631ebe0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bc81e4a88..1398d2e60 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6a593099c..d0f3eafcd 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 eab5a0689..07846c97c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4abbc7fcd..690e715ce 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ede3701b8..37ae2d45d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 62c32754f..3074b30d5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f6be1a178..31cf8a6c1 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d4484a052..b0c45ec1d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0dc8201ae..d2bb9bf87 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e152b2d32..ca368b224 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f45892520..d51fcb96a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gabbro" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9c3699c84..66c90e54b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gabbro" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 997a76b54..3e5c38d69 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6b7cff9f6..3caf84cc0 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gabbro_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 243d83d49..d00b2012f 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gabbro_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f1acf0ec2..439ef1d5f 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gabbro_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 22efc3bde..19d99c43a 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gabbro_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6a2f6a62d..1dbe79377 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7354b3d88..2eaace389 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a5ad1293e..5b5a35dde 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bacbb57be..bd8aab61a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 637c9fa35..5d03c7e68 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gabbro" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..6584801bd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:gabbro_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 3a1feed1b..c355b4b7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gabbro" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 85f7fcfdc..c8084aa59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gneiss" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..beaa7429e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 c8fc0da5f..0a48c7af3 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gneiss_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8cb529b9f..26236d114 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gneiss_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..8c27c95d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..5bbba36c7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 28117b261..66f4f0766 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gneiss_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5f0454691 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 a859e1df4..40a3963a7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gneiss_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..d4f7ae827 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json new file mode 100644 index 000000000..a0ecbbd98 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 86647abbc..f2eaef8ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gneiss" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..186d22cc4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d4e581aab --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ba00322e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..1f9ae1998 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..4e949e4ed --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..530df5323 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..a86899069 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..59ec06b83 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b67051c78 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..5a62f72d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..3ee687f62 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..bae07d14b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 7978d361f..44ae24bfc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 437c8c877..7f5080110 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9bf0c2465..40eedea04 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6b5d46613..0e1654237 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 89fc7aebc..c8a5c2b69 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1f3d61984..93770dddc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1e9539763..e71a4b4a3 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d06bfcd01..ca0d0afb9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 dd91ae901..621881484 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e00fd7645..7ab4a12eb 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 215b6cd1f..1246c7d82 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9d32ca546..1f496758e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7d6de48c4..abe8ee569 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7328bfcf5..f1b1d2355 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gneiss" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 db5df90ad..6ea57290a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gneiss" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 3de8e20d3..45d109de2 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 550abda0d..4bcacf841 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gneiss_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 125c5ddca..e92ac0f51 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gneiss_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 115aa2ce1..8107e7d4d 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gneiss_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5527cc34c..0a3c1130a 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gneiss_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d40a1cf41..740fea3c4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4c16dd7ec..ade53dc14 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3d07f56e7..af1064b44 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d06909b85..e7bf93cc4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 cd9eedec5..2b565bab5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gneiss" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..df2b361aa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:gneiss_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 1537e428d..0030a1805 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gneiss" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b1a1202a5..f5a9dfeb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:granite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..bd6c311d7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 18a5a82a5..fb1925794 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:granite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6155f3fb9..c5f751274 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:granite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5e09960c4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..1aa3e6b56 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 5d3856822..d2102a824 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:granite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2d512b92a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 3e3dcf12e..2ad9a3758 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:granite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b14b8bb06 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json new file mode 100644 index 000000000..a55da8c27 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:granite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 2a1dea18c..209940113 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/granite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..a39ca7fca --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..2065717f2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0680cc736 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..bfcd985d5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9b808cea6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..8bf87cbcc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..c8ff81f09 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..83d7f2713 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..5fff62fc2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..b9269e6af --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..92ae8d4e8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..6362ef29a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 c959b9e62..91f570664 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1ef424f02..dec766c89 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 84f7bf34c..0c0ac6b84 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 eb58d903c..caaf7294b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5a1c2fe6e..83d8b96a1 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d9fca36fe..4684e0090 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 94817c490..073643fd8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d0554db03..5d73f6210 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9c2ee2bff..f7fe5adae 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a532e86e8..d145d51e8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fad29666f..d114a6b58 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e821d9922..8c4d66766 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 49a456a24..722dca051 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3f00709a1..8709b48b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:granite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..1437e6230 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..78a95cae2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 c474178cb..740009362 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json @@ -1,31 +1,55 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/granite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 3cd5cdf51..ffd2aea96 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8673bbf0f..4aca6a1eb 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:granite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 583da25ca..d04b13a0f 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:granite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 07e85bff4..928f6ec4b 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:granite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f3deaf778..aca062852 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:granite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a905bc27b..1a1182ed7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 989f26650..afa5877fa 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..8642eb1c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..7c2482c8e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 d85c992c8..bcd2237d5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 423ff1fee..657126bc0 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 88cae8836..ab9b46109 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:granite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..c6165b7c2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:granite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f905f49f4..f28a9502e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:granite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..4605461e0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "SMELTABLE_GRAVEL" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gravel_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gravel_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:gravel" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..20def2aa0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json @@ -0,0 +1,46 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_carbon_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..8469116af --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_charcoal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_charcoal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d58f5305a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json @@ -0,0 +1,46 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_coal_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ef9589728 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_sugar" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_sugar" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json new file mode 100644 index 000000000..d7e6bf789 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gypsum" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gypsum" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gypsum_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json new file mode 100644 index 000000000..2e2a314ae --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gypsum_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gypsum_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gypsum" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 d547dc6ca..9a60ead00 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:hornfels" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..ac3339dc7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 abe2e5478..65715cf13 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:hornfels_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1df9bc543..eecf58746 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:hornfels_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..43a17ed71 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..fb288e72e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 8322a8b89..4b2539ff8 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:hornfels_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..e8e900211 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 259c4b6d7..59b1f5939 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:hornfels_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..18c0e226e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json new file mode 100644 index 000000000..e309b4dc1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 9e7d2a75e..a86b593bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:hornfels" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..dabf6a361 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..46f531e79 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..28a8a3f56 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..59ae96fc7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e9b3dc8f4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..2f4ddf63f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..76eb44ab0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..4f7fcbae0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..654f103f6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..e8bb70498 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..f0bb71013 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..0fbd75820 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 44b14279d..e7a4e7808 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5fff89458..a2a9e52fe 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0d55cbab2..93b1abf98 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9d89f7a19..3aa8fdd3a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e2ff46400..e223cf1d2 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c1cebeef6..c89972d06 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5ff3a9a60..cd4f9bfee 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 87dfa6691..79ad2349e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1bd252165..56ecd51b8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e154e4fdb..731e9b1c4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7f1b516a6..704698e10 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fe11cc976..61c39a323 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a627e1ecd..0d2b7ffe9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0a7188feb..65f26966e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:hornfels" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 42efdf269..43b5dd657 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:hornfels" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 e771af2e0..62917bc5e 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d2c36ebb6..8ae0d4568 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:hornfels_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 268bca891..bfd25cbf6 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:hornfels_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9c3ffaf6b..a6f0262f7 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:hornfels_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6430e3bc8..770005b48 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:hornfels_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a709374d6..48bfe1be6 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ea7fac865..955b9401c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 081bf5851..9fe48c4da 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 67f62b91f..4a783962e 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0c26f9e8c..1bc079a98 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:hornfels" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2fcf14eeb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:hornfels_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 fa3e45f31..a1e7a2064 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:hornfels" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e30471bc1..e08f85da8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:limestone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..4d91d909c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 541456dc5..f191490dc 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:limestone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e8edeaa9a..4d39ddfc7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:limestone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..144d736a8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..84a875765 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 ba0220943..81e829e02 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:limestone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..eda47d546 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 d90b9a912..1ab7bd83e 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:limestone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2f7be8d52 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json new file mode 100644 index 000000000..307dbd3cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 eda561dc6..b68ebf8ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:limestone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2cfd3a9a0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..65e5bf703 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..306a8590d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0569f6158 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9d7af16cf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..aadcd2827 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..eb700cecd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e28b2cc11 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6e48c9885 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f35e27a37 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..af700a727 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..c3e035507 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 81e0df21c..9b11a5fe7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 402e71b2b..e37e8cf9b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 018216db6..d88cb0f9f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f7a32c371..ecdfaade9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0113783b1..c2105c5a4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 20c1b0b0a..f9dbde247 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 683b4da23..c19c3fec6 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 eab7cc5fb..52014febf 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e15bd21cd..e5cf6a16f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b17fee696..c335d21d3 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 eb58698ce..b53222e46 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b6d12e2b9..bf73a3b6a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 477c11969..947183915 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 42a2b7998..bcb3254f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:limestone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3ffd510cf..c315a52fd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:limestone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 b2e8b47f2..50af62ff4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4e2d2cd98..b1e245aaa 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:limestone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 012d24e8f..35670fa63 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:limestone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0a8166cfb..a4974b0dd 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:limestone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7e32d086e..271771146 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:limestone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f2f32a598..b24c41c6d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 60b459a45..8b07b6f78 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 304fee0a3..0cc4053af 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ac6638224..c5108593c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5c92836ae..67c22543a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:limestone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..cc627606a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:limestone_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 ebb4cd56e..79f5a2c00 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:limestone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d329f8901..5368b4db1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:marble" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..8077123d5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 77fdc8726..edd523446 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:marble_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 47c73c073..14a707512 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:marble_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..6a1938113 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..49dad55f0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 7bee1207d..691eab5d4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:marble_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..01ec352b1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 5985d45a3..5098632ad 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:marble_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..3bd07dd3e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json new file mode 100644 index 000000000..69b5ebe26 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:marble_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f042a16c1..9c2b0d88b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:marble" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5a63292b6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d0d4b38c8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d754f647a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d2e7f49b3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9f50e73cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..1cba3ad77 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..7d245a8cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ca9923077 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..a8a17b928 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..78cefa034 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..83b5c21d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..d74e1fc7a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 c3c391950..793cb6476 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f1741690a..2b37d466a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 307833afc..84f2abe66 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a121db4d4..7a780c7ae 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5b54dccb4..d0292c193 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 474b42608..2c7fb0a95 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 97788fa8d..5ef6954fb 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7c7552c5a..fe4a1b72e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7e7ed8efe..74a4cc302 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 886edc46f..140ac92e9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ac7336b9c..0b3906220 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7a5fdc983..d0b03c00b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e26c3bb61..68336f272 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7e9c80fee..4d8c43f0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:marble" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2f7828fb4..ae5e51414 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:marble" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 d4a7f3086..118012f70 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7aa63e750..0d24aec13 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:marble_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f545ff9ce..42aeb47d9 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:marble_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e993f5de9..cec2a59b8 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:marble_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5f43f8ddd..253aa218e 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:marble_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b20343d10..e22778943 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 75aef38f7..8470817fd 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 55b8c650d..6f992f97b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2304dd01e..31d5a7449 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a9f0079c4..1a1678920 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:marble" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..d98337e6d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:marble_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 2d8154247..a17a25f71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:marble" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json new file mode 100644 index 000000000..e8d12eade --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:mineralfertilizer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:mineralfertilizer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json new file mode 100644 index 000000000..fa766a3a7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:nitrate_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:nitrate_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json new file mode 100644 index 000000000..18432ffc0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:nitrate_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:nitrate_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 cf87bea26..9f527c0f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:novaculite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b3776380c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 dd120aa0c..66f27d1e9 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:novaculite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ed358c9bd..d5fe9d101 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:novaculite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..7bd08b808 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..8a725b9ce --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 b8905bfb2..22dfe0ca9 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:novaculite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..3dcbd1911 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 898284b06..6afdddcd7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:novaculite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..30f8a247c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json new file mode 100644 index 000000000..6c9d1ac26 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 09653a509..a34ed4ca4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:novaculite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..a8981c701 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..babc4a92f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..3789436c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..cd8e3ae5b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..2bfaf217c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..61353898d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..3841b7f29 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..524975d17 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e70748850 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..3d38c0a89 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d8236fa46 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..c494106fa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 ca7eae3c5..8a5f9b1d6 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bcb74c5c7..3c7dc8e46 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b88b17e0b..63f2bd68b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f40c1b8c0..e7ccfd7cc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f346dcb83..d5dd2c2e0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 82fc15150..265e53477 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3307f06d0..cb49a6ada 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 346c3e17f..64c771426 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 baaa62d3e..41ff7311b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 577c3f156..d0ec3da39 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f702fcee0..8133b9920 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8058c72b0..4af98aca4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 be6c32ecf..c9b44bf2f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0eadc8505..3ce3d460a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:novaculite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 05b889bab..736f71224 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:novaculite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 cc8d16cdb..64aaf560c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a533e3f85..c6ec04c42 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:novaculite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 565723f03..05b9028da 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:novaculite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 be26cd305..9d3f0bd1a 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:novaculite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ce5bf8e83..a3ea9dd26 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:novaculite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 dc58cc3ac..2d98ac73f 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 af5fd82df..792445804 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 99306bd64..257632106 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 72bd1efee..2da4eb76d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7a13a9654..6de023d3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:novaculite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..ae9e2f5ab --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:novaculite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 9768874d3..e741432c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:novaculite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 25e2e71f7..4f06109c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:pegmatite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..7c0c6635b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 bd7b20380..59c4c016a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:pegmatite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3e934bb9f..c646a5aac 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:pegmatite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..68978ace6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..08de09ee2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f5e82bbc6..af9711a24 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:pegmatite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b1f1c042f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 a933ee773..8cfc8587a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:pegmatite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5db37d5d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json new file mode 100644 index 000000000..3c8c64134 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 55fdbb6ad..31176f902 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:pegmatite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f72b67a62 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..922e00ec5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ed8e166ec --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..f350571bf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c23997c05 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..4db050cea --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..71ca1ed8a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..f0c46bc6d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..bed6c556b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..82ef10ebe --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..db16074c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f153afd86 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 e5c2c5f33..b67dea7f5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 aefb9028b..c52553bf9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5beccd5ef..3572ed689 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 28ddb2604..33c289dc4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f3d9c860e..11ca07e4a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c78448e34..59c3a8297 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 efa55f1f7..f16475713 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 05e2d0dee..1e9d24f1b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2352e7e56..8b1e0d415 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a70be4816..abe13101b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4aaed7f76..116e0aa9c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d5e67c1eb..a83e7f19b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9da8365d7..22d891045 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a2b8955fd..95cd85004 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:pegmatite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b61c27be2..561ca72f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:pegmatite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 12458f24b..1b28fbd09 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 27001579c..6f6adde41 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:pegmatite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 619f4153c..4bb4d967a 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:pegmatite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0b233a2cd..6deab4416 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:pegmatite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0b256ec4d..8f8e459c5 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:pegmatite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 899cd4a42..fdcf69d16 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0e2326e1e..795de05b5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 797c771d2..9834f6360 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e63b7d3c6..2ec38e2b8 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9affac732..e6840dfe3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:pegmatite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..8972478b9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:pegmatite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 811ad7329..207b68d18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:pegmatite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 833766c69..8c33efdb9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:peridotite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..e941ba612 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 74fb271f7..b2a3b646b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:peridotite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4baea32bd..3725ee97d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:peridotite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f3117c378 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..6ab231c52 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 7ba568656..85b48a638 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:peridotite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..eefd327dd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 8f9b479bd..4be4c0bc5 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:peridotite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..011c04f8e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json new file mode 100644 index 000000000..ca53388ff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 8cf7aa37e..f4b065b5d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:peridotite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5160a313b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e0453c6a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..f7a1500e2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e8422aafc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..799af793d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..f211d59ef --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..af10c3bd1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..1ac871a7d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..90f3cf4f3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..12b5c7e5d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..8343cb25e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..5025149a2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 b44215100..32d53752b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b74a7b0be..aa8d4720b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4daf6e896..6bebd90da 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6dc945990..22d7bdc69 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f61095dda..24a622eb3 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 91e770259..5902d2ac9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c2b4025d0..33c5b110f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e81994567..630ea02b9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5dcdf63ca..6b576a597 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0d435eedd..2a76bba9b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b66b3f281..9682b5128 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2e77760bc..0bb0b1f83 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a6418d1d0..ab8dc041d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c8c355e43..0b9635f77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:peridotite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c9f17c025..862f10e34 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:peridotite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 97c4c3b41..193902dd8 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9d879ee9d..5be09eee1 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:peridotite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0f22e03ad..7b0eda58d 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:peridotite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b4a697384..beb26653f 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:peridotite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f398d068f..676415697 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:peridotite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ce444ee13..b1081d46b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e0a177766..1c45602b7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f8354a114..b89f981ff 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 652fafdcb..be8c4bd56 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b59fad9d5..dc3dec931 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:peridotite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..70d98398a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:peridotite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 8be02fc56..b7057cfdd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:peridotite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json new file mode 100644 index 000000000..b2b726df5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phosphorous_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phosphorous_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phosphorous_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json new file mode 100644 index 000000000..1e8cd3a1f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phosphorous_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phosphorous_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phosphorous_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 d4fe09369..97f4cb1f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:phyllite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..9185e5a01 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 262229b38..2cc6e91a0 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:phyllite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3328d3bf8..8d978e86b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:phyllite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..97d409b20 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..7abb42659 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 88684b2fc..acf14425f 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:phyllite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..52b35e196 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 8210339e2..9f23e1b85 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:phyllite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..bbf70d7fb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json new file mode 100644 index 000000000..c26f29dc2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 36bc3812a..8c799b7d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:phyllite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..9932eb9d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..171a93c29 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..23d406dc6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..3e4eecd17 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ca16560eb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..5f620c370 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..0c91b334a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..1994d2313 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..7d3b5ad27 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..5d66aa48d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..3fa79b7bf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..0c853637e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 60564ac2f..b844ab871 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4d2fe2179..898b94cb4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2625cf9e3..f3d0841d0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9e99be6a8..cc70147ec 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2e88edf2d..e0eb56f15 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5fb2686ac..b25c94f64 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 af2133918..d3578c65c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e95cc7ca0..a63e27756 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7fe848a7a..ae00671e1 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f73252fcb..875d383ca 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 375201f7b..e0d071e7a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b9fcc5bb6..6eebc63f6 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 26053b260..332df9b7b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2c3cb5a60..9f8535726 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:phyllite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f44e96560..cc531ff85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:phyllite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 42b19de8e..403453008 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 55e1c32fe..77c41a9c0 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:phyllite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7590d6ec0..65245b2b1 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:phyllite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0f6bae581..5ced82c2b 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:phyllite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e6865bffb..1ca906af4 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:phyllite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 34db3b6a2..d0faa6bcb 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 37df7e282..984a05eab 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 95ff1f7e9..3894bc42a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 066c2e3fc..85adaa19a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 977dc585d..03249b72b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:phyllite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..94940b1b7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:phyllite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 7913c7f1a..b0cf269bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:phyllite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ebb843a82..95dcf7baa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:quartzite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..88e7c9320 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 648a00968..880ee0962 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:quartzite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d5ff175e7..3f65e517b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:quartzite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..cd00fdbd1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f2bd1d16c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 8282e17ba..770292d4d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:quartzite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..286ca343d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 5ac901dbe..250465e51 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:quartzite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..77f997531 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json new file mode 100644 index 000000000..d8db91fe2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 de9e27ad7..04fe24f08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:quartzite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b3448b1a9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6857ae87d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d43e29554 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9f2836ed1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..71d6a26d0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..1e6a51698 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..658005d16 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..daabd5c4a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9340419dc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..b5ee497c2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6c80e9e7e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..d75ef45e6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 c5fa2a671..33f19127a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 212807b28..3b73d0f1d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 56024f09a..8f0bcbd57 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8713bca85..fd09123d8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 428735a39..2c7463ca8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7884c0f50..71b647639 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 859966a81..820b78589 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7086b7963..7ffa3604a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 96ead05a8..86b0e9b0a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 697348213..46542ae28 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c4e911a48..3b9c81818 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e1c9b9fed..22d1516b0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b94e7befb..e6b8d444a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d8fba7287..0e9f6f2e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:quartzite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1d037a0da..331e234b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:quartzite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 d0836e280..2594f4780 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6c1ff09af..dfdf55a1c 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:quartzite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9c6873c2c..9f6b76205 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:quartzite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4a74647d6..17b48b1f0 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:quartzite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ef3ec8db3..a21396c63 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:quartzite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2b754f6de..22119b5ab 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 524170879..a8cc7f945 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0f0400adc..2a022eee9 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ec169e4eb..a4e3ae385 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0815f2d00..1b6bab133 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:quartzite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..223260295 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:quartzite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 3bf375f17..fc06308af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:quartzite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 88a294fe4..ece6d2bd4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rhyolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..1a6346e1f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 3a9626919..f8fc99f17 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rhyolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f764aac8a..f1c7ccf0a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rhyolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..afb2cb616 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..aff64e8a1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 fdf7e0d58..4d8174938 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rhyolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..dab02b2b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 2ba1b7d2c..c0c782ba5 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rhyolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..cbd5a42a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json new file mode 100644 index 000000000..6f40338f4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 61d07ba77..0b7f442bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rhyolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..012222b13 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..67050a6b6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..70f8fc0b4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..288419b09 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..449c267f6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c7a8dd1d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..bdbe95e03 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..cae7e25ad --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..25c701182 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..ff7e505a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ba0c378cd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..77ce56e18 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 680982f90..a00b2c80a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a8134fe8d..686c893fe 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f3dd2e866..e69e87282 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 444a29a7c..e02f7023e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a0378bc25..a28ea4eb4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fba17d61c..05b644652 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9154e2322..b9c6fb532 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4b1e39c0e..f7108533d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bfbaf0f0e..761efdcfe 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2818b3cfe..c98f61076 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ccab2fc32..ab8b8e111 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7fa553076..44b3d22b0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 afcae8bbf..a21c06157 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fb3566bba..f6304e012 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rhyolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 884ba7d31..74eb88186 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rhyolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 f3c6c2d7e..2f02f6248 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ff2e148c6..0aaf3805c 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rhyolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 92796d15f..e0754f576 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rhyolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0998a32a7..d5c382d91 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rhyolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0890eb119..e00f3deb7 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rhyolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4573a347c..d1c19ad11 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5c1baca8d..977338bab 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e842e9d81..ba1ea51ef 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a24ad8989..6a26e30cb 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fb8de3987..e035b8c4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rhyolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..e7ae53a73 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:rhyolite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 dc7072c9c..3bf071eac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rhyolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json new file mode 100644 index 000000000..3f40dd869 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 e6c1dbf60..72f69c2c3 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..51f09c36a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 7a15858fc..3a5e44570 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rock_salt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 eb16a887c..053c29fe1 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rock_salt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2ec07c1ca --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..549fda4a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 24b3efc5d..bd5608b06 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rock_salt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..6aa539606 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 5a2a4bc5c..49282617a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rock_salt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..eef66878a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..109a3bda5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..18130a4da --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json @@ -0,0 +1,39 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 cf96a2e74..c38aa94ab 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..a1398894c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0e13087b8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..61065c090 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ccc6e5157 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..896458d1e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c436f08c6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..fcf4a46ba --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..75e51604e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e99affff2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..a926c47c4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..a633bafd3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..eaaca4abc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 9d8e61384..1c7edd3d8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1dc27276d..1d295b747 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1eacbb2c9..8ca2982db 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bd9e99704..c7c30fbe9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 826647baf..e244f79ab 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8a32c677c..7dca39a0e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 18688685e..097e285e8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4896126cb..4011c6243 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f5999c334..72ebf74ea 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8356ff3c3..b09309229 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3d6637f78..e73dc4224 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 31d6bd8be..6adf187b1 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bb60ad305..30087754a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f6faa0ef7..007f4133d 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,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7f66adec4..1ca000577 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,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 fb38c8e7b..850fd8e21 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d874f45a1..9970f261e 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rock_salt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 16d81080c..d85a6940c 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rock_salt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9e86fee04..bcf540d2f 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rock_salt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ceaad0c6d..b6ce37f2e 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rock_salt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 56b82fb37..5332b766b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0c1eb7bc2..521b72d25 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ec33abaaf..a690ad9fa 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 872d224d0..d224151d4 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1d8ac691c..f608fbb83 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..d38d6f17c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:rock_salt_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 9fc85860e..5c94e951d 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,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json index 02501417f..1e86a41ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json @@ -1,33 +1,43 @@ { - "rewards": { - "recipes": [ - "mineralogy:rocksaltlamp" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rocksaltlamp" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rocksaltlamp" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rocksaltlamp" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json index e61ec9947..c778cdbad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json @@ -1,33 +1,43 @@ { - "rewards": { - "recipes": [ - "mineralogy:rocksaltstreetlamp" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rocksaltstreetlamp" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rocksaltlamp" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rocksaltstreetlamp" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rocksaltstreetlamp" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rocksaltlamp" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4caca83c8..865875653 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:schist" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f62748b20 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 2400c75f6..4e0b621da 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:schist_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6be1edb38..b1dbb6f1e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:schist_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..9d8c60dad --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..3db7fa80e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f3df51fcc..20e047763 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:schist_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..133bc9a78 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 ec9011c44..4cb615491 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:schist_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f5eb925ad --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json new file mode 100644 index 000000000..81ff5298c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:schist_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 c911253cc..a087ccdcd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:schist" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2bc50ead9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..452f9f43f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..773dcd0ee --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..266571f5a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..a9cecf6b0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c8b46ae32 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..8624965d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..87bab7e10 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..e2044714b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..baa83cef9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b195e8180 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..8ec382762 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 8a1210a28..77a1a896d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d962e5caf..547bd2bcc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ac9b621dd..5ded27acd 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ef32959a6..d73b4073f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 178324209..cd11fc3bd 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0ac4a5354..cdfd09fb4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a8cf4f03a..eaaf582fc 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6bf80314f..9ffd053e4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6b088d54d..eb98f042c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3d63c9ca2..e8bbda7b0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 533f1fdeb..2fa7c8562 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 86fb9ef71..a5f92b7d7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a4ebdf6ea..cc46f0ca9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 407d29001..c55abca06 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:schist" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e06f0d4fb..fefbf02ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:schist" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 f08e9e00d..ce4a4ff11 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9df29a39b..675d6d518 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:schist_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 21c996419..c28685b94 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:schist_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e764c783f..d3d53e267 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:schist_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4cd807668..a0e364b2a 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:schist_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5ad45374c..fc587fd0d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d6be4599f..8e15fbd31 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 cbb189eeb..ad52f9696 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 298c5c2ff..f9f536af7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 820805085..5be1cac9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:schist" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..6464668a8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:schist_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 d31342ab2..d89b7ad42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:schist" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 99dfc1660..f1de1193e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:scoria" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..14b2c52e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 9204d0dc3..e342f82b7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:scoria_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 20ca4ed46..1ccca1758 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:scoria_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5449caf26 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..8e5789ebe --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 ca71f2815..2fd12f4dc 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:scoria_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..0107cfd0b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 a115adeda..f4f06eab1 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:scoria_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..5f9355056 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json new file mode 100644 index 000000000..9152dab50 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 d5b6119d1..a9482d2f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:scoria" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..38b01bc22 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c1087bf79 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0a8556d30 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..74b675bf1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..beb9bfd0d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..8f6764311 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..381645e9a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..8401a0cb0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..cb5d3692f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..dabc74152 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..98d6afb13 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..e65e6d97f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 b8a15eaa7..2b473fb36 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f4965292a..799c52827 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 368c00b06..60280e82c 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ef110939c..082e4ef55 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b28b6011e..0f97c5b80 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5726956a3..0f92209b7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 07da1e979..0126ed0b9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 265ec0778..998701a7b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 38712a67b..57ec013d9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3e21fd62f..0a3f27181 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a108cfc95..907fa458d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1f82fa4d3..6ddb473e8 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c5ea52e25..f7d356433 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 57d8e4b71..8f0dd4f58 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:scoria" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e7b6fd611..49f4f540f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:scoria" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 e7632d9f8..da434cc9b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4b78b14d2..363d9e783 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:scoria_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 51b2b2382..1ccb175a2 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:scoria_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2c7d10228..30e5baa2e 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:scoria_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 689624ce6..f08453b9f 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:scoria_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6bc4e390c..f66328ee9 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 73292f91e..84fa5dbd7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f82d488ff..70c7b914c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 263f30c5f..22bada23a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 41c1a28a1..802d0a47d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:scoria" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..bae399f83 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:scoria_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 70bd6e10e..70080c282 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:scoria" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b19f01012..c08ddf22f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:shale" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2671b1e37 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 7ab8a5eef..743ae0d0d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:shale_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1df129dc1..50fbc4746 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:shale_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..bbfd5ea54 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..bbcf84402 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 1da7ba327..e5c30a781 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:shale_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..b42b67eef --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 7144628ee..100285025 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:shale_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..ca5ea2371 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json new file mode 100644 index 000000000..278d99242 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:shale_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 91aa114ca..e9255888e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:shale" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..2b76053f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..ebc2c37b1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..61be42aa2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..87a9bbbc9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9f91faea4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..588a2e293 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..f170378ba --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9bb830a99 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..63a7c7b4e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..03d9c64a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..041ce9d88 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..10c01f7fc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 e5c853eff..1c13c2ebb 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 20143b55a..d520c3da4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 44e8f7dc5..473b35eb6 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1f671e8cb..a4dee7817 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bc7dd0754..62b725125 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4a1f831a3..c205f580a 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3ede26a98..64f1a09da 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 792463509..2f148d8c4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ff0591a66..9bf1c4383 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 514ab9503..428f1e5de 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b3282fcfd..3cc548f81 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7bf1cfade..fd8ae0d8b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 50c2fa38b..660e4a124 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 b81f534cf..57d3c741d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:shale" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f96fe49cb..a2735a0cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:shale" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 eec00464b..6f8c6f42d 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 da39262cb..5593f374e 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:shale_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fe37d12c2..db7f99057 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:shale_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1151995b6..a30f35f8d 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:shale_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 59fca3da5..c73657f47 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:shale_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d3407476b..64c53e764 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 784acace0..12ef6b515 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d8f3c258f..63f752637 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3a07b99bd..f3f03517a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fe9515a95..ae4731826 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:shale" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..45e57dc71 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:shale_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 7bd38a282..80df05d3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:shale" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 552737a7e..10795fb26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:siltstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..eb452a9b1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 d4b0807d1..04ad34875 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:siltstone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 9ef6dae36..0296c2e55 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:siltstone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..12688eff6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..ae568a5f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f894f52fc..61d7ed873 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:siltstone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..cdaf1dee2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 3379098ad..a6ca42eaf 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:siltstone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..6c3e4990c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json new file mode 100644 index 000000000..719a5451c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 678cc8bab..773bbb97d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:siltstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f1c5dd03c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..242a57a72 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..21ad744da --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..c603c13de --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..4e719e832 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6e45ba050 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..1102f5083 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..7d61ce558 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..5d4c26ee9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..342e84658 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..4e19898ab --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..76aafdb31 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 2fd816d0d..c2d21b558 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 cc5447cac..2b05c7ded 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e143b63f1..0b674413f 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5a1aa35d9..0d168d978 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 92ff8efef..a0bfeb255 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d60b45d78..9acd8c7d5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 4f3e86ee5..3dd8f3530 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8eec2685b..ee0c48c7b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2b5fc1356..722a6f3d5 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 335260668..02c7d0489 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f29a6d920..982f60eb0 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7914371b9..f7c11e5b7 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c849fe1f1..08bd78e03 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2972d96a3..2763a319f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:siltstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f5e0929ad..f118562f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:siltstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 ac5c5b3b5..82953d08c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c0e2ff3de..6a639b00b 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:siltstone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 119708ebc..30f63293b 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:siltstone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 28fbd8b66..06119d087 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:siltstone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6af42f8e2..8dc53758c 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:siltstone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 940efc9ad..2ba6c13eb 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 762b6a381..48a6b8b67 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7f6fb5126..52e656b3b 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 468a773c8..8ca8c9c40 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8ac19cc71..8eeb1f23e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:siltstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..ec2fcab18 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:siltstone_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 db395dea1..dff08bbee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:siltstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e23db8e7c..56face22c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:slate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..7c29cb057 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 b8382355d..157119e77 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:slate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 5de2f61f4..575576141 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:slate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..402806507 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..993e4f27a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 039126202..19b8842ca 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:slate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..1c447e04b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 7d3e54e04..fc197dfc2 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:slate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..02bed47a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json new file mode 100644 index 000000000..376b95251 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:slate_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 868abeacc..71f88c505 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:slate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..020af723e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..f213fa7cb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6b27e904a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..b02a331da --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..310b39197 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..6bbbdc113 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..e44592d15 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..77f198d07 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9c8c154f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..042913e4b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..91a9b7987 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..af8954a13 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 f4daa0258..754b237f2 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 cc080d555..7bae0e712 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 ff2c305e2..e2e900788 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a5a32d584..31d4d69a9 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f3a6a21f4..b30f0f453 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 c4ccc76d8..5dad9b738 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 07980c436..919351d4e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6c6be09fb..218ae1bd1 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 332f8d34e..db8240e9e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 071b06f9b..9e14ca936 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 eea95c7c3..6e7288dcf 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bad73b393..5e9e71b96 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2c6369f9d..32c3ba73d 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0d2000fc4..8b11d0149 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json @@ -1,33 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:slate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 72fead37f..aff6d6a6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json @@ -1,33 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:slate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 5312619ee..f5f7c9940 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7918564d5..0e71e584a 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:slate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 418932b40..2498af630 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:slate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 01e93b90e..b3dfeb384 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:slate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 fdcf59ecc..2492fa73a 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:slate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 7ca65321d..b7071d4aa 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 44b4010e3..7ef7238ae 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f1fba4eb1..e80c9b09e 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8b3828891..2cd09d0a3 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 487924cbd..193be4e26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:slate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f41ca56a2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:slate_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 d9cac1429..7e008f67f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json @@ -1,33 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:slate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json new file mode 100644 index 000000000..46ef79a37 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:sulfur_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:sulfur_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:sulfur_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json new file mode 100644 index 000000000..ea78406d8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:sulfur_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:sulfur_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:sulfur_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 9201de583..ea5c77b39 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..45fd568ce --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 8d4344339..ba3ba45a9 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:tuff_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8948a0851..c69de25bb 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:tuff_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..0b6c7142e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..41b63f54c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 acb56c3a3..a95107876 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:tuff_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..dbeeeebfa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 09e522258..68c6f109c 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:tuff_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..7ace17c24 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json new file mode 100644 index 000000000..ee70874a2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json @@ -0,0 +1,34 @@ +{ + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 3f5959c8b..310786a69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..f8e104869 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..d8abf518f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..fe74c85d2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..7385b2461 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..0ea2d4f4d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..333bb4cf3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..d844f1980 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..28275adb0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9877ff0ed --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..cc41945c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 new file mode 100644 index 000000000..9b6175aeb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json @@ -0,0 +1,72 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} 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 new file mode 100644 index 000000000..b4a9b8845 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json @@ -0,0 +1,43 @@ +{ + "conditions": [ + { + "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" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 c7a8dbeb7..6fd7cbfba 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 95edc477e..d2a76e998 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 028e03a0f..ce735ab65 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 48809c176..159b21252 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0164702ea..8698a7c29 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 396974dc1..7c170103b 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 a4d5c7338..303ef46d4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 683d30b89..84561d3ad 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 2e32f7a12..26d24e070 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 15fc7a909..e8f84483e 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e5b060cc0..6eda57ac4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 d1b706199..4711947ac 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 becd52776..d91708dc4 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,35 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 1efe579af..94ca821a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 3b4f56296..4df07c5c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json @@ -1,31 +1,53 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } 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 145d49a4f..c3950d2d7 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 6e421eba1..be36b2d53 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:tuff_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 078cd8082..3bab27067 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,36 +1,39 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:tuff_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f3f7b44ad..847a67f30 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:tuff_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 8b18cbb96..ea40252dc 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,36 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:tuff_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 bceb7d520..58e663f51 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 f8501d0c8..860138c2a 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 50c3f7f3a..1d12f2c59 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 0fdf9c02e..6050e5cfb 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,35 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 e423afbc8..73b318866 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } 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 new file mode 100644 index 000000000..6f4eef5e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json @@ -0,0 +1,33 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:tuff_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} 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 0171535ad..ca375c69b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json @@ -1,31 +1,37 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/orespawn/provider.json b/src/main/resources/data/mineralogy/orespawn/provider.json index 81be55288..a26226a43 100644 --- a/src/main/resources/data/mineralogy/orespawn/provider.json +++ b/src/main/resources/data/mineralogy/orespawn/provider.json @@ -1,651 +1,641 @@ { - "schema_version": 3, - "provider_modid": "mineralogy", - "provider_revision": 3, - "profile_defaults": { - "geology_mode": "geome", - "place_fluid_deposits": true, - "manage_vanilla_ores": false, - "default_template": "", - "geome_scale": 384.0, - "biome_influence": 1.15, - "regional_noise_influence": 0.9, - "boundary_noise_influence": 0.45, - "formations": { - "algorithm": "stable_layers", - "horizontal_size": "average", - "vertical_thickness": "average", - "waviness": "average", - "edge_irregularity": "average", - "formation_continuity": "average", - "custom": { - "stratum_wavelength": 256, - "family_region_wavelength": 100, - "vertical_thickness": 8, - "waviness_amplitude": 60, - "edge_octaves": 4, - "continuity": 0.85 - } - }, - "worldgen_aliases": { - "mineralogy:andesite": "minecraft:andesite", - "mineralogy:basalt": "minecraft:basalt", - "mineralogy:diorite": "minecraft:diorite", - "mineralogy:granite": "minecraft:granite", - "mineralogy:tuff": "minecraft:tuff" - }, - "cyano": { - "geome_size": 100, - "rock_layer_noise": 32.0, - "rock_layer_thickness": 8 - }, - "terrain_dimensions": { - "minecraft:overworld": { - "enabled": true, - "biome_ids": [ - - ], - "biome_namespaces": [ - - ], - "host_blocks": [ - "minecraft:stone", - "minecraft:deepslate" - ], - "host_tags": [ - - ] - } - } - }, - "fluid_deposits": { - "mineralogy:fluid_deposit/crude_oil": { - "enabled": true, - "block": "mineralogy:crude_oil", - "dimensions": { - "minecraft:overworld": { - "enabled": true, - "min_y": -48, - "max_y": 48, - "frequency": 0.08, - "min_radius": 5, - "max_radius": 12, - "min_vertical_radius": 2, - "max_vertical_radius": 5, - "max_lobes": 4, - "min_solid_cover": 2, - "host_families": ["sedimentary"], - "host_blocks": [], - "host_tags": [], - "biome_ids": [], - "excluded_biome_ids": [], - "biome_dictionary": ["OCEAN"], - "excluded_biome_dictionary": [], - "geomes": {} - } - } - } - }, - "rocks": { - "mineralogy:rock/minecraft/andesite": { - "family": "igneous_volcanic", - "depth_peak": 68, - "depth_spread": 42, - "weight": 1.0, - "geomes": { - "volcanic_arc": 3.0, - "mountain_belt": 1.2 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "minecraft:andesite" - }, - "mineralogy:rock/minecraft/basalt": { - "family": "igneous_volcanic", - "depth_peak": 72, - "depth_spread": 36, - "weight": 1.2, - "geomes": { - "volcanic_arc": 4.0, - "coastal_shelf": 0.7 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "minecraft:basalt" - }, - "mineralogy:rock/mineralogy/rhyolite": { - "family": "igneous_volcanic", - "depth_peak": 70, - "depth_spread": 36, - "weight": 1.0, - "geomes": { - "volcanic_arc": 3.5, - "mountain_belt": 0.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:rhyolite" - }, - "mineralogy:rock/mineralogy/basaltic_glass": { - "family": "igneous_volcanic", - "depth_peak": 78, - "depth_spread": 24, - "weight": 0.75, - "geomes": { - "volcanic_arc": 4.5 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:basaltic_glass" - }, - "mineralogy:rock/mineralogy/scoria": { - "family": "igneous_volcanic", - "depth_peak": 80, - "depth_spread": 22, - "weight": 0.85, - "geomes": { - "volcanic_arc": 4.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:scoria" - }, - "mineralogy:rock/minecraft/tuff": { - "family": "igneous_volcanic", - "depth_peak": 74, - "depth_spread": 30, - "weight": 0.9, - "geomes": { - "volcanic_arc": 3.5, - "arid_basin": 0.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "minecraft:tuff" - }, - "mineralogy:rock/mineralogy/pumice": { - "family": "igneous_volcanic", - "depth_peak": 82, - "depth_spread": 20, - "weight": 0.65, - "geomes": { - "volcanic_arc": 4.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:pumice" - }, - "mineralogy:rock/minecraft/diorite": { - "family": "igneous_intrusive", - "depth_peak": 36, - "depth_spread": 42, - "weight": 1.0, - "geomes": { - "stable_craton": 1.3, - "mountain_belt": 1.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "minecraft:diorite" - }, - "mineralogy:rock/minecraft/granite": { - "family": "igneous_intrusive", - "depth_peak": 30, - "depth_spread": 48, - "weight": 1.1, - "geomes": { - "stable_craton": 2.0, - "mountain_belt": 1.4 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "minecraft:granite" - }, - "mineralogy:rock/mineralogy/pegmatite": { - "family": "igneous_intrusive", - "depth_peak": 26, - "depth_spread": 36, - "weight": 0.8, - "geomes": { - "stable_craton": 1.6, - "mountain_belt": 1.2 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:pegmatite" - }, - "mineralogy:rock/mineralogy/diabase": { - "family": "igneous_intrusive", - "depth_peak": 30, - "depth_spread": 40, - "weight": 1.0, - "geomes": { - "stable_craton": 1.2, - "volcanic_arc": 1.2 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:diabase" - }, - "mineralogy:rock/mineralogy/gabbro": { - "family": "igneous_intrusive", - "depth_peak": 20, - "depth_spread": 44, - "weight": 1.1, - "geomes": { - "stable_craton": 1.2, - "mountain_belt": 1.2 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:gabbro" - }, - "mineralogy:rock/mineralogy/peridotite": { - "family": "igneous_intrusive", - "depth_peak": 10, - "depth_spread": 34, - "weight": 0.85, - "geomes": { - "mountain_belt": 1.5, - "volcanic_arc": 1.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:peridotite" - }, - "mineralogy:rock/mineralogy/shale": { - "family": "sedimentary", - "depth_peak": 62, - "depth_spread": 36, - "weight": 1.15, - "geomes": { - "sedimentary_basin": 3.5, - "wetland_basin": 2.0, - "coastal_shelf": 1.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:shale" - }, - "mineralogy:rock/mineralogy/conglomerate": { - "family": "sedimentary", - "depth_peak": 58, - "depth_spread": 32, - "weight": 0.9, - "geomes": { - "sedimentary_basin": 2.2, - "mountain_belt": 0.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:conglomerate" - }, - "mineralogy:rock/mineralogy/dolomite": { - "family": "sedimentary", - "depth_peak": 55, - "depth_spread": 38, - "weight": 0.9, - "geomes": { - "coastal_shelf": 2.2, - "sedimentary_basin": 1.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:dolomite" - }, - "mineralogy:rock/mineralogy/limestone": { - "family": "sedimentary", - "depth_peak": 60, - "depth_spread": 40, - "weight": 1.0, - "geomes": { - "coastal_shelf": 3.0, - "sedimentary_basin": 1.6 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:limestone" - }, - "mineralogy:rock/mineralogy/siltstone": { - "family": "sedimentary", - "depth_peak": 66, - "depth_spread": 34, - "weight": 1.0, - "geomes": { - "sedimentary_basin": 2.4, - "wetland_basin": 1.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:siltstone" - }, - "mineralogy:rock/mineralogy/rock_salt": { - "family": "sedimentary", - "depth_peak": 54, - "depth_spread": 28, - "weight": 0.6, - "geomes": { - "arid_basin": 4.0, - "coastal_shelf": 1.2 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:rock_salt" - }, - "mineralogy:rock/mineralogy/chert": { - "family": "sedimentary", - "depth_peak": 48, - "depth_spread": 32, - "weight": 0.65, - "geomes": { - "coastal_shelf": 2.0, - "sedimentary_basin": 1.4 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:chert" - }, - "mineralogy:rock/mineralogy/gypsum": { - "family": "sedimentary", - "depth_peak": 52, - "depth_spread": 26, - "weight": 0.65, - "geomes": { - "arid_basin": 3.5, - "coastal_shelf": 1.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:gypsum" - }, - "mineralogy:rock/mineralogy/chalk": { - "family": "sedimentary", - "depth_peak": 68, - "depth_spread": 24, - "weight": 0.65, - "geomes": { - "coastal_shelf": 3.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:chalk" - }, - "mineralogy:rock/minecraft/sandstone": { - "family": "sedimentary", - "depth_peak": 72, - "depth_spread": 28, - "weight": 0.55, - "geomes": { - "arid_basin": 2.5, - "coastal_shelf": 0.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "minecraft:sandstone" - }, - "mineralogy:rock/mineralogy/marble": { - "family": "metamorphic", - "depth_peak": 32, - "depth_spread": 36, - "weight": 0.85, - "geomes": { - "mountain_belt": 1.8, - "stable_craton": 1.2 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:marble" - }, - "mineralogy:rock/mineralogy/slate": { - "family": "metamorphic", - "depth_peak": 36, - "depth_spread": 34, - "weight": 1.0, - "geomes": { - "mountain_belt": 2.0, - "sedimentary_basin": 0.7 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:slate" - }, - "mineralogy:rock/mineralogy/schist": { - "family": "metamorphic", - "depth_peak": 24, - "depth_spread": 34, - "weight": 1.0, - "geomes": { - "mountain_belt": 2.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:schist" - }, - "mineralogy:rock/mineralogy/gneiss": { - "family": "metamorphic", - "depth_peak": 18, - "depth_spread": 38, - "weight": 1.0, - "geomes": { - "mountain_belt": 2.6, - "stable_craton": 1.2 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:gneiss" - }, - "mineralogy:rock/mineralogy/phyllite": { - "family": "metamorphic", - "depth_peak": 34, - "depth_spread": 34, - "weight": 0.9, - "geomes": { - "mountain_belt": 2.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:phyllite" - }, - "mineralogy:rock/mineralogy/amphibolite": { - "family": "metamorphic", - "depth_peak": 18, - "depth_spread": 34, - "weight": 0.9, - "geomes": { - "mountain_belt": 2.4, - "volcanic_arc": 0.8 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:amphibolite" - }, - "mineralogy:rock/mineralogy/hornfels": { - "family": "metamorphic", - "depth_peak": 24, - "depth_spread": 28, - "weight": 0.75, - "geomes": { - "volcanic_arc": 2.0, - "mountain_belt": 1.4 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:hornfels" - }, - "mineralogy:rock/mineralogy/quartzite": { - "family": "metamorphic", - "depth_peak": 30, - "depth_spread": 34, - "weight": 0.85, - "geomes": { - "mountain_belt": 1.8, - "stable_craton": 1.0 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:quartzite" - }, - "mineralogy:rock/mineralogy/novaculite": { - "family": "metamorphic", - "depth_peak": 28, - "depth_spread": 30, - "weight": 0.65, - "geomes": { - "mountain_belt": 1.6 - }, - "enabled": true, - "min_y": -64, - "max_y": 319, - "ore_replaceable": true, - "block": "mineralogy:novaculite" - } - }, - "ores": { - "mineralogy:ore/mineralogy/sulfur_ore": { - "enabled": true, - "source_mod": "mineralogy", - "dimensions": { - "minecraft:overworld": { - "enabled": true, - "min_y": 16, - "max_y": 64, - "frequency": 1.0, - "quantity": 16, - "host_families": [ - "sedimentary", - "metamorphic", - "igneous_intrusive", - "igneous_volcanic" - ], - "host_tags": [ - "minecraft:stone_ore_replaceables", - "minecraft:deepslate_ore_replaceables" - ] - } - }, - "block": "mineralogy:sulfur_ore" - }, - "mineralogy:ore/mineralogy/phosphorous_ore": { - "enabled": true, - "source_mod": "mineralogy", - "dimensions": { - "minecraft:overworld": { - "enabled": true, - "min_y": 16, - "max_y": 64, - "frequency": 1.0, - "quantity": 16, - "host_families": [ - "sedimentary", - "metamorphic", - "igneous_intrusive", - "igneous_volcanic" - ], - "host_tags": [ - "minecraft:stone_ore_replaceables", - "minecraft:deepslate_ore_replaceables" - ] - } - }, - "block": "mineralogy:phosphorous_ore" - }, - "mineralogy:ore/mineralogy/nitrate_ore": { - "enabled": true, - "source_mod": "mineralogy", - "dimensions": { - "minecraft:overworld": { - "enabled": true, - "min_y": 16, - "max_y": 64, - "frequency": 1.0, - "quantity": 16, - "host_families": [ - "sedimentary", - "metamorphic", - "igneous_intrusive", - "igneous_volcanic" - ], - "host_tags": [ - "minecraft:stone_ore_replaceables", - "minecraft:deepslate_ore_replaceables" - ] - } - }, - "block": "mineralogy:nitrate_ore" - } - }, - "geomes": { - - }, - "biome_rules": { - - }, - "terrain_dimensions": { - - }, - "templates": { - - } + "schema_version": 4, + "provider_modid": "mineralogy", + "provider_revision": 3, + "profile_defaults": { + "geology_mode": "geome", + "place_fluid_deposits": true, + "manage_vanilla_ores": false, + "default_template": "", + "geome_scale": 384, + "biome_influence": 1.15, + "regional_noise_influence": 0.9, + "boundary_noise_influence": 0.45, + "formations": { + "algorithm": "stable_layers", + "horizontal_size": "average", + "vertical_thickness": "average", + "waviness": "average", + "edge_irregularity": "average", + "formation_continuity": "average", + "custom": { + "stratum_wavelength": 256, + "family_region_wavelength": 100, + "vertical_thickness": 8, + "waviness_amplitude": 60, + "edge_octaves": 4, + "continuity": 0.85 + } + }, + "worldgen_aliases": { + "mineralogy:andesite": "minecraft:andesite", + "mineralogy:basalt": "minecraft:basalt", + "mineralogy:diorite": "minecraft:diorite", + "mineralogy:granite": "minecraft:granite", + "mineralogy:tuff": "minecraft:tuff" + }, + "cyano": { + "geome_size": 100, + "rock_layer_noise": 32, + "rock_layer_thickness": 8 + }, + "terrain_dimensions": { + "minecraft:overworld": { + "enabled": true, + "biome_ids": [], + "biome_namespaces": [], + "host_blocks": [ + "minecraft:stone", + "minecraft:deepslate" + ], + "host_tags": [] + } + } + }, + "fluid_deposits": { + "mineralogy:fluid_deposit/crude_oil": { + "enabled": true, + "block": "mineralogy:crude_oil", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -48, + "max_y": 48, + "frequency": 0.08, + "min_radius": 5, + "max_radius": 12, + "min_vertical_radius": 2, + "max_vertical_radius": 5, + "max_lobes": 4, + "min_solid_cover": 2, + "host_families": [ + "sedimentary" + ], + "host_blocks": [], + "host_tags": [], + "biome_ids": [], + "excluded_biome_ids": [], + "biome_dictionary": [ + "OCEAN" + ], + "excluded_biome_dictionary": [], + "geomes": {} + } + } + } + }, + "rocks": { + "mineralogy:rock/minecraft/andesite": { + "family": "igneous_volcanic", + "depth_peak": 68, + "depth_spread": 42, + "weight": 1, + "geomes": { + "volcanic_arc": 3, + "mountain_belt": 1.2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "minecraft:andesite" + }, + "mineralogy:rock/minecraft/basalt": { + "family": "igneous_volcanic", + "depth_peak": 72, + "depth_spread": 36, + "weight": 1.2, + "geomes": { + "volcanic_arc": 4, + "coastal_shelf": 0.7 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "minecraft:basalt" + }, + "mineralogy:rock/mineralogy/rhyolite": { + "family": "igneous_volcanic", + "depth_peak": 70, + "depth_spread": 36, + "weight": 1, + "geomes": { + "volcanic_arc": 3.5, + "mountain_belt": 0.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:rhyolite" + }, + "mineralogy:rock/mineralogy/basaltic_glass": { + "family": "igneous_volcanic", + "depth_peak": 78, + "depth_spread": 24, + "weight": 0.75, + "geomes": { + "volcanic_arc": 4.5 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:basaltic_glass" + }, + "mineralogy:rock/mineralogy/scoria": { + "family": "igneous_volcanic", + "depth_peak": 80, + "depth_spread": 22, + "weight": 0.85, + "geomes": { + "volcanic_arc": 4 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:scoria" + }, + "mineralogy:rock/minecraft/tuff": { + "family": "igneous_volcanic", + "depth_peak": 74, + "depth_spread": 30, + "weight": 0.9, + "geomes": { + "volcanic_arc": 3.5, + "arid_basin": 0.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "minecraft:tuff" + }, + "mineralogy:rock/mineralogy/pumice": { + "family": "igneous_volcanic", + "depth_peak": 82, + "depth_spread": 20, + "weight": 0.65, + "geomes": { + "volcanic_arc": 4 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:pumice" + }, + "mineralogy:rock/minecraft/diorite": { + "family": "igneous_intrusive", + "depth_peak": 36, + "depth_spread": 42, + "weight": 1, + "geomes": { + "stable_craton": 1.3, + "mountain_belt": 1 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "minecraft:diorite" + }, + "mineralogy:rock/minecraft/granite": { + "family": "igneous_intrusive", + "depth_peak": 30, + "depth_spread": 48, + "weight": 1.1, + "geomes": { + "stable_craton": 2, + "mountain_belt": 1.4 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "minecraft:granite" + }, + "mineralogy:rock/mineralogy/pegmatite": { + "family": "igneous_intrusive", + "depth_peak": 26, + "depth_spread": 36, + "weight": 0.8, + "geomes": { + "stable_craton": 1.6, + "mountain_belt": 1.2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:pegmatite" + }, + "mineralogy:rock/mineralogy/diabase": { + "family": "igneous_intrusive", + "depth_peak": 30, + "depth_spread": 40, + "weight": 1, + "geomes": { + "stable_craton": 1.2, + "volcanic_arc": 1.2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:diabase" + }, + "mineralogy:rock/mineralogy/gabbro": { + "family": "igneous_intrusive", + "depth_peak": 20, + "depth_spread": 44, + "weight": 1.1, + "geomes": { + "stable_craton": 1.2, + "mountain_belt": 1.2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:gabbro" + }, + "mineralogy:rock/mineralogy/peridotite": { + "family": "igneous_intrusive", + "depth_peak": 10, + "depth_spread": 34, + "weight": 0.85, + "geomes": { + "mountain_belt": 1.5, + "volcanic_arc": 1 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:peridotite" + }, + "mineralogy:rock/mineralogy/shale": { + "family": "sedimentary", + "depth_peak": 62, + "depth_spread": 36, + "weight": 1.15, + "geomes": { + "sedimentary_basin": 3.5, + "wetland_basin": 2, + "coastal_shelf": 1.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:shale" + }, + "mineralogy:rock/mineralogy/conglomerate": { + "family": "sedimentary", + "depth_peak": 58, + "depth_spread": 32, + "weight": 0.9, + "geomes": { + "sedimentary_basin": 2.2, + "mountain_belt": 0.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:conglomerate" + }, + "mineralogy:rock/mineralogy/dolomite": { + "family": "sedimentary", + "depth_peak": 55, + "depth_spread": 38, + "weight": 0.9, + "geomes": { + "coastal_shelf": 2.2, + "sedimentary_basin": 1.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:dolomite" + }, + "mineralogy:rock/mineralogy/limestone": { + "family": "sedimentary", + "depth_peak": 60, + "depth_spread": 40, + "weight": 1, + "geomes": { + "coastal_shelf": 3, + "sedimentary_basin": 1.6 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:limestone" + }, + "mineralogy:rock/mineralogy/siltstone": { + "family": "sedimentary", + "depth_peak": 66, + "depth_spread": 34, + "weight": 1, + "geomes": { + "sedimentary_basin": 2.4, + "wetland_basin": 1.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:siltstone" + }, + "mineralogy:rock/mineralogy/rock_salt": { + "family": "sedimentary", + "depth_peak": 54, + "depth_spread": 28, + "weight": 0.6, + "geomes": { + "arid_basin": 4, + "coastal_shelf": 1.2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:rock_salt" + }, + "mineralogy:rock/mineralogy/chert": { + "family": "sedimentary", + "depth_peak": 48, + "depth_spread": 32, + "weight": 0.65, + "geomes": { + "coastal_shelf": 2, + "sedimentary_basin": 1.4 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:chert" + }, + "mineralogy:rock/mineralogy/gypsum": { + "family": "sedimentary", + "depth_peak": 52, + "depth_spread": 26, + "weight": 0.65, + "geomes": { + "arid_basin": 3.5, + "coastal_shelf": 1 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:gypsum" + }, + "mineralogy:rock/mineralogy/chalk": { + "family": "sedimentary", + "depth_peak": 68, + "depth_spread": 24, + "weight": 0.65, + "geomes": { + "coastal_shelf": 3 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:chalk" + }, + "mineralogy:rock/minecraft/sandstone": { + "family": "sedimentary", + "depth_peak": 72, + "depth_spread": 28, + "weight": 0.55, + "geomes": { + "arid_basin": 2.5, + "coastal_shelf": 0.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "minecraft:sandstone" + }, + "mineralogy:rock/mineralogy/marble": { + "family": "metamorphic", + "depth_peak": 32, + "depth_spread": 36, + "weight": 0.85, + "geomes": { + "mountain_belt": 1.8, + "stable_craton": 1.2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:marble" + }, + "mineralogy:rock/mineralogy/slate": { + "family": "metamorphic", + "depth_peak": 36, + "depth_spread": 34, + "weight": 1, + "geomes": { + "mountain_belt": 2, + "sedimentary_basin": 0.7 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:slate" + }, + "mineralogy:rock/mineralogy/schist": { + "family": "metamorphic", + "depth_peak": 24, + "depth_spread": 34, + "weight": 1, + "geomes": { + "mountain_belt": 2.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:schist" + }, + "mineralogy:rock/mineralogy/gneiss": { + "family": "metamorphic", + "depth_peak": 18, + "depth_spread": 38, + "weight": 1, + "geomes": { + "mountain_belt": 2.6, + "stable_craton": 1.2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:gneiss" + }, + "mineralogy:rock/mineralogy/phyllite": { + "family": "metamorphic", + "depth_peak": 34, + "depth_spread": 34, + "weight": 0.9, + "geomes": { + "mountain_belt": 2 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:phyllite" + }, + "mineralogy:rock/mineralogy/amphibolite": { + "family": "metamorphic", + "depth_peak": 18, + "depth_spread": 34, + "weight": 0.9, + "geomes": { + "mountain_belt": 2.4, + "volcanic_arc": 0.8 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:amphibolite" + }, + "mineralogy:rock/mineralogy/hornfels": { + "family": "metamorphic", + "depth_peak": 24, + "depth_spread": 28, + "weight": 0.75, + "geomes": { + "volcanic_arc": 2, + "mountain_belt": 1.4 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:hornfels" + }, + "mineralogy:rock/mineralogy/quartzite": { + "family": "metamorphic", + "depth_peak": 30, + "depth_spread": 34, + "weight": 0.85, + "geomes": { + "mountain_belt": 1.8, + "stable_craton": 1 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:quartzite" + }, + "mineralogy:rock/mineralogy/novaculite": { + "family": "metamorphic", + "depth_peak": 28, + "depth_spread": 30, + "weight": 0.65, + "geomes": { + "mountain_belt": 1.6 + }, + "enabled": true, + "min_y": -64, + "max_y": 319, + "ore_replaceable": true, + "block": "mineralogy:novaculite" + } + }, + "ores": { + "mineralogy:ore/mineralogy/sulfur_ore": { + "enabled": true, + "source_mod": "mineralogy", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": 16, + "max_y": 64, + "frequency": 1, + "quantity": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "block": "mineralogy:sulfur_ore" + }, + "mineralogy:ore/mineralogy/phosphorous_ore": { + "enabled": true, + "source_mod": "mineralogy", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": 16, + "max_y": 64, + "frequency": 1, + "quantity": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "block": "mineralogy:phosphorous_ore" + }, + "mineralogy:ore/mineralogy/nitrate_ore": { + "enabled": true, + "source_mod": "mineralogy", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": 16, + "max_y": 64, + "frequency": 1, + "quantity": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "block": "mineralogy:nitrate_ore" + } + }, + "geomes": {}, + "biome_rules": {}, + "terrain_dimensions": {}, + "templates": {} } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json index 276d96d1e..5260c5732 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..22784fc5f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 4d771d493..6f3067120 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_furnace", + "count": 1 + } } 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 c16114637..0844f6c69 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..9acc6d823 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..53ecceedd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "result": { + "item": "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 44081145d..169c07cac 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..5e2fd45d2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 9f07e2e7c..3cf543947 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..d0c2115c1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 226d4ef4c..edbc9fba4 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/amphibolite" + }, + { + "tag": "mineralogy:stones/amphibolite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 6c07d0292..dd8fdd3dc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json deleted file mode 100644 index 169ba69ff..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..561202097 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..5b2847dec --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..921622f22 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d760123ff --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..dd5c5f0a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..5c91b2377 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..9bcf682d8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_slab" + }, + { + "item": "mineralogy:amphibolite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..684890ce9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_slab" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..ad65b8c30 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f1c91a178 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_stairs" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..8ceabe30f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e5807bace --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_wall" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_wall", + "count": 4 + } +} 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 abff0c10e..8430086e1 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 b77ccd656..09571c10d 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_blank", + "count": 16 + } } 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 00aa76233..7e23747bf 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_cross", + "count": 4 + } } 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 448ff854d..a266ce7be 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_hammer", + "count": 7 + } } 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 e915a8ac9..c924d645b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 fa82021c0..d21e805f9 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_horizontal", + "count": 3 + } } 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 df42e373c..86825ffc7 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_i", + "count": 7 + } } 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 f0ee2f255..8aaf58447 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_left", + "count": 3 + } } 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 8f38c6d56..d79e21adc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 9d599619e..fc3b18a29 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_plus", + "count": 5 + } } 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 89525cba1..0d8e6c057 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_left" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_left" + }, + { + "item": "mineralogy:amphibolite_relief_left" + } + ], + "result": { + "item": "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 1d0d79d68..3d111ef13 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 c2c32cdf9..2bb055305 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json index 2edb866dd..af6aa6dca 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json deleted file mode 100644 index aa47ac8cb..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - "result": "mineralogy:amphibolite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json index 4b7b51689..eae23bc79 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/amphibolite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 33958c479..aa3bfbf37 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick", + "count": 4 + } } 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 a5151b36d..aeabf96f2 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_furnace", + "count": 1 + } } 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 40cd9fd46..bd2e7438b 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 6 + } } 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 7b30234c9..a48175516 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 4 + } } 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 170015dff..96b275299 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 6 + } } 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 42e59c558..923b3a628 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_furnace", + "count": 1 + } } 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 7efb6bfe5..9872c016c 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_slab", + "count": 6 + } } 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 2b4a00272..d3762b3ea 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_stairs", + "count": 4 + } } 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 6a37525e8..b36304d06 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json index 334079fde..1e651319f 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json deleted file mode 100644 index fb25e2da3..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - "result": "mineralogy:amphibolite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json index 874327c44..729a00d6b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json deleted file mode 100644 index a4fdbb202..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - "result": "mineralogy:amphibolite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_brick.json index 7a456b1d8..5740d9c37 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite" + } + }, + "result": { + "item": "mineralogy:andesite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..0b40f75c1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 f07b5e5ff..8f18b2227 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_brick_furnace", + "count": 1 + } } 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 f2129160e..c78f6b288 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..d3c47a4f0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..596e10490 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_slab" + }, + { + "item": "mineralogy:andesite_brick_slab" + } + ], + "result": { + "item": "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 a8f960dbf..e50feedbe 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..fc64b61a9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 60fa256ec..fc0a9e9af 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..b01334fd0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 f424fb525..90f2e7e7c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/andesite" - }, - { - "tag": "mineralogy:crafting_materials/andesite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/andesite" + }, + { + "tag": "mineralogy:stones/andesite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 ff5736e63..c6f6938ad 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json deleted file mode 100644 index 04516291a..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/andesite" - } - }, - "result": { - "item": "mineralogy:andesite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..44941b733 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..c5080bdb9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_slab" + }, + { + "item": "mineralogy:andesite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..edbe54bb3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..1061c426a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..eae25f636 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..54a355e6d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..58c605f5d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + }, + { + "item": "mineralogy:andesite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..0e1ba6592 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_slab" + } + }, + "result": { + "item": "mineralogy:andesite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d5335cfac --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..962cfa533 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_stairs" + } + }, + "result": { + "item": "mineralogy:andesite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a6a0d96d8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..14ec700b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_wall" + } + }, + "result": { + "item": "mineralogy:andesite_brick_wall", + "count": 4 + } +} 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 bbae33aee..a3444878f 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 444cc9640..de99c73fb 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_relief_blank", + "count": 16 + } } 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 994303234..0cae2f918 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_cross", + "count": 4 + } } 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 2c3784e3f..2c115d488 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_hammer", + "count": 7 + } } 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 f972e24cb..9d5b45d59 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 d927b97f0..ce9f238b9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_horizontal", + "count": 3 + } } 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 1fcb86ecd..4d4d2aa9d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_i", + "count": 7 + } } 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 e5553683c..802eed0d5 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_left", + "count": 3 + } } 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 900e63634..d61f2f0b0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 b526472de..e95b092c4 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_plus", + "count": 5 + } } 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 05bbace35..5a088311c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_left" - } - }, - "result": { - "item": "mineralogy:andesite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_left" + }, + { + "item": "mineralogy:andesite_relief_left" + } + ], + "result": { + "item": "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 fe1eec8a3..1d98482d9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:andesite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 c215d568b..634f06e71 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_slab.json index b94c0fd64..84448be70 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json deleted file mode 100644 index 6eea5c122..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_slab", - "count": 2 - } - } - ] -} 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 new file mode 100644 index 000000000..e9eb7b104 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:andesite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..6cb241219 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + } + ], + "result": { + "item": "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 11b8fe9b0..9a0161586 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/andesite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 3e0874ff1..ba669938d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick", + "count": 4 + } } 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 bcd8c299b..8d0299092 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_furnace", + "count": 1 + } } 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 ebe0bccc3..7ec534eb6 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 6 + } } 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 b74c6ca71..a317c793b 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 4 + } } 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 4cef22fa1..0fa95bb26 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 6 + } } 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 0bd083cf6..cbb7f8cc0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_furnace", + "count": 1 + } } 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 2b62dd2b2..5a3108780 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..1acebfab3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_andesite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f7c3990d7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_slab" + } + ], + "result": { + "item": "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 e0aba3b6a..e58f87740 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_stairs", + "count": 4 + } } 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 de919e6bd..91824e0a9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json index c3dfd930e..7a5e3f930 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json deleted file mode 100644 index 780037585..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_wall.json index 188059bcf..baf0cac41 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json deleted file mode 100644 index 7b724a288..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_brick.json index 8fb3833cd..4ed70aa03 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt" - } - }, - "result": { - "item": "mineralogy:basalt_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..36c893a55 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 af1d81025..1dd19ba48 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_brick_furnace", + "count": 1 + } } 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 8842aaef2..485cb8bf2 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..4b1625477 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..2a849f5be --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_slab" + }, + { + "item": "mineralogy:basalt_brick_slab" + } + ], + "result": { + "item": "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 87febf344..5e9d9d7d1 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..c72a0c9b6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 b493a7826..4fa4b86a4 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..ac79702c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 c71623c52..01164df22 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/basalt" - }, - { - "tag": "mineralogy:crafting_materials/basalt" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basalt" + }, + { + "tag": "mineralogy:stones/basalt" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 aa576088c..e1c0e2007 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json deleted file mode 100644 index 66cbbf039..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..121872a63 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e1fed3406 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_smooth_slab" + }, + { + "item": "mineralogy:basalt_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..750e1fe93 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_slab" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..daa60e917 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..fbb5cdf64 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_wall" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..0d7a8c27c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..74b1da25a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_slab" + }, + { + "item": "mineralogy:basalt_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..12c02fb29 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_slab" + } + }, + "result": { + "item": "mineralogy:basalt_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a23ed08ff --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f7177c4a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_stairs" + } + }, + "result": { + "item": "mineralogy:basalt_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..4ded39b40 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..aa545527f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_wall" + } + }, + "result": { + "item": "mineralogy:basalt_brick_wall", + "count": 4 + } +} 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 d2e434080..7257d47c6 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 c28af0406..30807f462 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_relief_blank", + "count": 16 + } } 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 443790480..aa697b50a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_cross", + "count": 4 + } } 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 825caa41f..e8281e957 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_hammer", + "count": 7 + } } 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 bf3bc58f4..c0ddc40e6 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 fd13b3d91..7ae389b40 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_horizontal", + "count": 3 + } } 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 195fe87ed..91039a9bb 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_i", + "count": 7 + } } 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 4d7f7dc75..deb4bcf73 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_left", + "count": 3 + } } 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 339143455..08d5f5a2d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 872dfb500..f8df4bfb9 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_plus", + "count": 5 + } } 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 4b17e24c6..cb1d08039 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_left" - } - }, - "result": { - "item": "mineralogy:basalt_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_left" + }, + { + "item": "mineralogy:basalt_relief_left" + } + ], + "result": { + "item": "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 a2b3cb2f4..b41308380 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:basalt_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 af3ce50ec..1aa8367dd 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_slab.json index 3ccdb0d80..1329a923f 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json deleted file mode 100644 index 2c37fcfb3..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basalt" - }, - "result": "mineralogy:basalt_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json index 200e03385..3d5753de1 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/basalt" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 086da93fb..64f933490 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick", + "count": 4 + } } 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 d0ae2c34d..16802e41a 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_furnace", + "count": 1 + } } 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 a4de0864d..1b24852a1 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 6 + } } 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 66ae4e2b7..995bfa8a8 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 4 + } } 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 e252641c7..cb3c0083d 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 6 + } } 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 9cd6cd7a2..8b27c15ee 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_furnace", + "count": 1 + } } 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 04041d057..c30892425 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_slab", + "count": 6 + } } 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 df59ba68b..787b2b1a4 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_stairs", + "count": 4 + } } 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 7fe7c5904..a9a024747 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json index 6a105c5d0..2ae5dc62a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json deleted file mode 100644 index 705eb00d4..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basalt" - }, - "result": "mineralogy:basalt_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_wall.json index 939a01227..ba2df709f 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json deleted file mode 100644 index 1fa5ce507..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basalt" - }, - "result": "mineralogy:basalt_wall", - "count": 1 - } - } - ] -} 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 62ce63fbc..d7f55a794 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..ce378047e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 00d09c1a7..6dae43190 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,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_furnace", + "count": 1 + } } 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 6c2425202..5764656cd 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,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..f03822674 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f178ab12c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "result": { + "item": "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 5a4cedb37..5873c7902 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..0b75de479 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 fd964d4fd..c7e64eb5d 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,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..0111c354b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 bc53334de..5e20f9d29 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basaltic_glass" + }, + { + "tag": "mineralogy:stones/basaltic_glass" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 8878131ce..77282e596 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json deleted file mode 100644 index 73891a30f..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..41dede8f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..a8e69c102 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ad3c2767c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "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", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..fc626c198 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "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", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d74b2b74c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "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", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_wall" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..60ed864ed --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..bd6374c96 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_slab" + }, + { + "item": "mineralogy:basaltic_glass_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..b4beb1980 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_slab" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..bd3109657 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..b15376a85 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_stairs" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..4f26e8dfc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..b2a7236a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_wall" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_wall", + "count": 4 + } +} 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 4a7204994..839498834 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 1430eda6e..4706fd8be 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_blank", + "count": 16 + } } 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 2e9d20319..cac03fdca 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_cross", + "count": 4 + } } 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 d8b238198..e09e34c27 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,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_hammer", + "count": 7 + } } 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 9c1dce487..2a0cbb51e 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 fea53fb53..67d861632 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,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_horizontal", + "count": 3 + } } 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 9e60d4b2b..561d4e213 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_i", + "count": 7 + } } 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 c8dd3100e..526e08dd2 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_left", + "count": 3 + } } 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 a779d3d16..837a8112b 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 8c0b09720..749b0251f 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_plus", + "count": 5 + } } 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 e4af5aa6a..284131221 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,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_left" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_left" + }, + { + "item": "mineralogy:basaltic_glass_relief_left" + } + ], + "result": { + "item": "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 a24a1bd19..1616f9bde 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 8572d39f0..31ebc51f3 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_vertical", + "count": 3 + } } 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 00f505789..bd090e3f5 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json deleted file mode 100644 index 2bf2d06e4..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_slab", - "count": 2 - } - } - ] -} 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 e8301e233..d54ab8266 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basaltic_glass" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 7eb07841c..ed487ffcc 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,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick", + "count": 4 + } } 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 005f3df06..6d95f7917 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_furnace", + "count": 1 + } } 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 8aecdf8ce..c00445abc 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 6 + } } 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 e7f2999d4..243a9cc05 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 4 + } } 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 a9ae65645..7ae80c6df 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 6 + } } 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 23b9b0e6e..7ed5de699 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,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_furnace", + "count": 1 + } } 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 2e2ef55af..e4be16070 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,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_slab", + "count": 6 + } } 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 b7f65e6d8..5cb5e15ab 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_stairs", + "count": 4 + } } 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 8ccd29249..f1d68d01e 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,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_wall", + "count": 6 + } } 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 06d6a8290..52d6ac35c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json deleted file mode 100644 index 8e4c3a7fa..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_stairs", - "count": 1 - } - } - ] -} 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 7a23a41c3..80e6b9b8c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json deleted file mode 100644 index af60d8a83..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/chalk.json b/src/main/resources/data/mineralogy/recipes/chalk.json index 044bb0a1b..47e52508a 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk.json +++ b/src/main/resources/data/mineralogy/recipes/chalk.json @@ -1,15 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "forge:dusts/chalk" - } - }, - "result": { - "item": "mineralogy:chalk" - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:dusts/chalk" + } + }, + "result": { + "item": "mineralogy:chalk", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/recipes/chalk_dust.json index 359bbe768..72f6bed92 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk_dust.json +++ b/src/main/resources/data/mineralogy/recipes/chalk_dust.json @@ -1,12 +1,18 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/chalk" - } - ], - "result": { - "item": "mineralogy:chalk_dust", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/chalk" + } + ], + "result": { + "item": "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 63f7df18c..8dccd39c0 100644 --- a/src/main/resources/data/mineralogy/recipes/cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:stone" + }, + { + "item": "minecraft:stone" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 f1c1cb1ed..2509a906d 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..37b528c62 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 0ab969abb..fe14cdf23 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_furnace", + "count": 1 + } } 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 d6a832254..895cb946f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..23bbf947c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..818749429 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "result": { + "item": "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 e6313fc1d..1ed504d0e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..7833468ce --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 bfb5163be..8e00a92fa 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..cbe4890be --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 c20bcce5a..2903e343c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/conglomerate" + }, + { + "tag": "mineralogy:stones/conglomerate" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 449e15262..6111ff2d2 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json deleted file mode 100644 index aa29e6672..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..3962b8822 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..b97c1200b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..10d5bdbff --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_slab" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a5156e70e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..99cc5fdcc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_wall" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..e70f71006 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3b4dfc0dc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_slab" + }, + { + "item": "mineralogy:conglomerate_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..aac672673 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_slab" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..098a32866 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..8b7dfbe71 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_stairs" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..e23769f7d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..c4f08e7fe --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_wall" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_wall", + "count": 4 + } +} 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 b5691bc76..7e4190bb4 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 bae9ab0fd..6fdfa6925 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_blank", + "count": 16 + } } 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 9d96f065b..f1326cbc3 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_cross", + "count": 4 + } } 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 31a94aed7..2a6eb8a05 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_hammer", + "count": 7 + } } 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 f64a56c34..e905306cd 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 b386f69c2..cb8f11232 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_horizontal", + "count": 3 + } } 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 786987036..6fbc2bb0a 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_i", + "count": 7 + } } 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 184f7a790..b1257f54f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_left", + "count": 3 + } } 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 6d1693000..19c079d4d 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 641c63499..939fa6d53 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_plus", + "count": 5 + } } 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 3201a868a..04672d26c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_left" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_left" + }, + { + "item": "mineralogy:conglomerate_relief_left" + } + ], + "result": { + "item": "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 ca521b0f9..7598b15db 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 d1f2fe952..d2eb22a24 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json index 64903ddbe..abde9816f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json deleted file mode 100644 index b4547e014..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - "result": "mineralogy:conglomerate_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json index 8a315915f..7e8de5bc8 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/conglomerate" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 39c7b96d8..7a8573987 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick", + "count": 4 + } } 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 14a281df6..18880a57d 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_furnace", + "count": 1 + } } 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 a5eb77a3a..d2ec2f724 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 6 + } } 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 5a1b993b1..029b5c13f 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 4 + } } 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 de9508085..003801e35 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 6 + } } 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 3a6cf18cc..c31c41fe3 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_furnace", + "count": 1 + } } 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 1d1ff7424..6c98e594a 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_slab", + "count": 6 + } } 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 e06382af1..e38363bbe 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_stairs", + "count": 4 + } } 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 a287930af..987ffdfec 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json index 31e71d05f..e2aff7a49 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json deleted file mode 100644 index ee54c05f8..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - "result": "mineralogy:conglomerate_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json index 9486d0fa2..dd03282b9 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json deleted file mode 100644 index 701179c21..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - "result": "mineralogy:conglomerate_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_brick.json index 90fd9fc67..988b95613 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..a93073ad7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 adf8c3ef1..9211115c6 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_brick_furnace", + "count": 1 + } } 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 b16a2c4af..73371a275 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..a9c169568 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..9945cf220 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_slab" + }, + { + "item": "mineralogy:diabase_brick_slab" + } + ], + "result": { + "item": "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 a8a8ba8ca..ebc4c5611 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..93ac0526a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 6f5860ab2..ac0ec85e2 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..7e9e0caf4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 86e0f2ca3..e1b433a63 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/diabase" - }, - { - "tag": "mineralogy:crafting_materials/diabase" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diabase" + }, + { + "tag": "mineralogy:stones/diabase" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 7abfdfbb0..bf9aa287d 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json deleted file mode 100644 index 8716b9c39..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..68325c2fb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..595df7ceb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_smooth_slab" + }, + { + "item": "mineralogy:diabase_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f2dd4f03b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_slab" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a5d1bd8c7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..64b16c6b2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_wall" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..221d780d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..6d8ee951b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_slab" + }, + { + "item": "mineralogy:diabase_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..bc1439a5e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_slab" + } + }, + "result": { + "item": "mineralogy:diabase_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a50cdff3a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f275690e6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_stairs" + } + }, + "result": { + "item": "mineralogy:diabase_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d6bc77583 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..142b57ee7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_wall" + } + }, + "result": { + "item": "mineralogy:diabase_brick_wall", + "count": 4 + } +} 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 1afd6ebf9..88e167b75 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 a9e69fbf2..f372cb7e6 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + } + }, + "result": { + "item": "mineralogy:diabase_relief_blank", + "count": 16 + } } 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 17f29da31..7b2464a77 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_cross", + "count": 4 + } } 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 cfdb628b1..821456c56 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_hammer", + "count": 7 + } } 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 445da48ff..bffec9b4e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 1e974ffaf..f61599567 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_horizontal", + "count": 3 + } } 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 afe5f8da3..0a34fa385 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_i", + "count": 7 + } } 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 eca7f8cf7..6b7ccf990 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_left", + "count": 3 + } } 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 e4aed98c8..0429f5740 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 45b70a6f9..1b71114df 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_plus", + "count": 5 + } } 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 b40fed0be..d4acc1d6c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_left" - } - }, - "result": { - "item": "mineralogy:diabase_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_left" + }, + { + "item": "mineralogy:diabase_relief_left" + } + ], + "result": { + "item": "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 93b491f6d..b9edda999 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:diabase_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 be9ce321c..77abcb795 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_slab.json index 0691e00c4..d59cae0fb 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase" + } + }, + "result": { + "item": "mineralogy:diabase_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json deleted file mode 100644 index 563bd6a69..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/diabase" - }, - "result": "mineralogy:diabase_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json index 9ca764a92..b95899615 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/diabase" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diabase" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 09f81cf6c..a3f682701 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick", + "count": 4 + } } 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 3cf3ca4b1..f70b600fc 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_furnace", + "count": 1 + } } 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 a0b645054..46399a6fb 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 6 + } } 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 980de2c62..ea77b9b52 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 4 + } } 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 9abfd973f..50b654409 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 6 + } } 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 5ee754201..e0931c652 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_furnace", + "count": 1 + } } 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 aca6ce061..a1890504e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_slab", + "count": 6 + } } 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 ecaec3787..96ebb8474 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_stairs", + "count": 4 + } } 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 b9828127f..e06d2c92a 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json index aaf4461d3..d0ea1b59f 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json deleted file mode 100644 index c6453235b..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/diabase" - }, - "result": "mineralogy:diabase_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_wall.json index 2d1fd5f27..7f3ac455f 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json deleted file mode 100644 index 2993e06e0..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/diabase" - }, - "result": "mineralogy:diabase_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_brick.json index 6a41cba4b..ae3007dbb 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite" + } + }, + "result": { + "item": "mineralogy:diorite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..e421ef0e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 8eac164cd..0ccb6ed13 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_brick_furnace", + "count": 1 + } } 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 1d5ac5349..af438b7e8 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..40cba09d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..6e8709b8c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_slab" + }, + { + "item": "mineralogy:diorite_brick_slab" + } + ], + "result": { + "item": "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 12cf5a755..02101f2d9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..76ea7c165 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 e7b7b4d19..3dfc495c8 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..7a5c11e4a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 f8c6127c1..c6655c690 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/diorite" - }, - { - "tag": "mineralogy:crafting_materials/diorite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diorite" + }, + { + "tag": "mineralogy:stones/diorite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 2a5c42c70..6d35f8dbf 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json deleted file mode 100644 index 644869ec8..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diorite" - } - }, - "result": { - "item": "mineralogy:diorite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..6908a96c0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..4c138764d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_slab" + }, + { + "item": "mineralogy:diorite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..11b035a69 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..0054024fc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..2a3c82747 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..f882428e0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..9384befc9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + }, + { + "item": "mineralogy:diorite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f71092ffc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_slab" + } + }, + "result": { + "item": "mineralogy:diorite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..caf193471 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d2e3068e6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_stairs" + } + }, + "result": { + "item": "mineralogy:diorite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a66429018 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..09a6db13f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_wall" + } + }, + "result": { + "item": "mineralogy:diorite_brick_wall", + "count": 4 + } +} 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 aaf4e7cbb..f9faa4df0 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 2e804a8d9..616687912 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_relief_blank", + "count": 16 + } } 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 8434dcad3..4e2d68af9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_cross", + "count": 4 + } } 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 d83dfec5b..a3cce08c7 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_hammer", + "count": 7 + } } 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 f11a5c6cc..5fefcfa1d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 d94fce255..5f0174326 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_horizontal", + "count": 3 + } } 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 0529d33f7..ddd54bf85 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_i", + "count": 7 + } } 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 f1f8afe11..f0480722e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_left", + "count": 3 + } } 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 da597b39e..282fef905 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 80539df14..e408b3e28 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_plus", + "count": 5 + } } 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 36ea805f3..3d3d7169b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_left" - } - }, - "result": { - "item": "mineralogy:diorite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_left" + }, + { + "item": "mineralogy:diorite_relief_left" + } + ], + "result": { + "item": "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 bda59de8e..9c0a3f055 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:diorite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 e9dcabfa6..34ca47e46 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_slab.json index 5a8d1a59e..6194e68a7 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json deleted file mode 100644 index 1157fbad9..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_slab", - "count": 2 - } - } - ] -} 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 new file mode 100644 index 000000000..f7e0f47d7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..82b8c746f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + } + ], + "result": { + "item": "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 fd3d61590..94545ae5a 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/diorite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 fcd2dccf5..bf0d14faf 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick", + "count": 4 + } } 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 ce67f1747..c80802380 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_furnace", + "count": 1 + } } 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 1c8e3ef22..3878b8495 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 6 + } } 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 7b14b3928..0e296f7f3 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 4 + } } 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 55d6a67cb..1b7efe70b 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 6 + } } 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 d624cf381..36272c488 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_furnace", + "count": 1 + } } 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 f25a14fb0..b5382a16e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..1c0e97d97 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_diorite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..984f9e0cb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_slab" + } + ], + "result": { + "item": "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 91ae97173..ffcba0d92 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_stairs", + "count": 4 + } } 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 d7e5b2cd8..ee0b47e25 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json index 81724bbd6..fed8816f0 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json deleted file mode 100644 index fa523c7d7..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_wall.json index 567be8198..df77b691b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json deleted file mode 100644 index 2993dd121..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json index be0d05ec2..3658cef00 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..057480376 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 aff892105..e4badc351 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_furnace", + "count": 1 + } } 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 18a5d6876..9defb15aa 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..a280d3b35 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..9990e6d8b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_slab" + }, + { + "item": "mineralogy:dolomite_brick_slab" + } + ], + "result": { + "item": "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 3824747be..b883901a1 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..11cb487e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 b03d9c4fa..110fd8a6b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..42a08eb2e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 6ab3a4c35..a2f058c7c 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/dolomite" - }, - { - "tag": "mineralogy:crafting_materials/dolomite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/dolomite" + }, + { + "tag": "mineralogy:stones/dolomite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 594d1a822..e417931c9 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json deleted file mode 100644 index 326fbb07d..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..4e6afcb6e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..cc0bcdf15 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1abf3c3eb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d5ad48da8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..0c8b68390 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..6121a2fc3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..4b8488bbd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_slab" + }, + { + "item": "mineralogy:dolomite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..70833fd1b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_slab" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..db8061ea9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..518950d14 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_stairs" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..ce4ed58cc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d54fc7a93 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_wall" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_wall", + "count": 4 + } +} 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 e156f7544..2bb67b6a8 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 e3e65cd9d..0007e6edb 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_blank", + "count": 16 + } } 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 0f9f5125d..3d8315dcb 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_cross", + "count": 4 + } } 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 9fbef9bed..92275d553 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_hammer", + "count": 7 + } } 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 4fde0f972..e37cfacb3 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 9f8b619fd..3f3fd1472 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_horizontal", + "count": 3 + } } 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 3ce66b0cb..b91f7bfb7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_i", + "count": 7 + } } 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 5860e5a53..484c593b6 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_left", + "count": 3 + } } 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 711fee4de..dbf6df552 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 fe75cd5f5..dd80b8b1d 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_plus", + "count": 5 + } } 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 815b6af29..1c97c7614 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_left" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_left" + }, + { + "item": "mineralogy:dolomite_relief_left" + } + ], + "result": { + "item": "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 dcd717df1..c1fd2a3af 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 537f29da9..642a291fd 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json index ee597099e..92b1d1c62 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json deleted file mode 100644 index 4c8c62532..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/dolomite" - }, - "result": "mineralogy:dolomite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json index 213e2fea3..be2098daa 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/dolomite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/dolomite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 c144d7f5d..90304a7c3 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick", + "count": 4 + } } 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 2b9c9cf92..eddfcea15 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_furnace", + "count": 1 + } } 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 b8aa5ce3f..470eaef77 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 6 + } } 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 a061403f8..c1cd24ee2 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 4 + } } 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 7d0d0f113..deb4507d5 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 6 + } } 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 7e9ffcefc..2422b95c7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_furnace", + "count": 1 + } } 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 dfc759213..e6e9c628a 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_slab", + "count": 6 + } } 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 d0136ebd9..21d2633c5 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_stairs", + "count": 4 + } } 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 2880fe08a..33c051f0b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json index a18a60bee..3004bfb31 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json deleted file mode 100644 index 48fddadd1..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/dolomite" - }, - "result": "mineralogy:dolomite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json index a717d76c9..ac7bf1c53 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json deleted file mode 100644 index 6144fe20e..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/dolomite" - }, - "result": "mineralogy:dolomite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/drywall.json b/src/main/resources/data/mineralogy/recipes/drywall.json index 891fec107..df2ec0e51 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall.json +++ b/src/main/resources/data/mineralogy/recipes/drywall.json @@ -1,20 +1,30 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "pgp", - "pgp", - "pgp" - ], - "key": { - "p": { - "item": "minecraft:paper" - }, - "g": { - "tag": "forge:dusts/gypsum" - } - }, - "result": { - "item": "mineralogy:drywall_white", - "count": 3 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "pgp", + "pgp", + "pgp" + ], + "key": { + "p": { + "tag": "forge:paper" + }, + "g": { + "tag": "forge:dusts/gypsum" + } + }, + "result": { + "item": "mineralogy:drywall_white", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_black.json b/src/main/resources/data/mineralogy/recipes/drywall_black.json index 717b3c46f..093ac9571 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_black.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_black.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/black" - } - ], - "result": { - "item": "mineralogy:drywall_black" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:ink_sac" + } + ], + "result": { + "item": "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 e4a7cc07f..69061d5d1 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_blue.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_blue.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/blue" - } - ], - "result": { - "item": "mineralogy:drywall_blue" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:lapis_lazuli" + } + ], + "result": { + "item": "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 111246dbd..bca763d82 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_brown.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_brown.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/brown" - } - ], - "result": { - "item": "mineralogy:drywall_brown" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:cocoa_beans" + } + ], + "result": { + "item": "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 ca1b58dd1..4f87c0a6f 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_cyan.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_cyan.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/cyan" - } - ], - "result": { - "item": "mineralogy:drywall_cyan" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:cyan_dye" + } + ], + "result": { + "item": "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 637180196..c232c19f9 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_gray.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_gray.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/gray" - } - ], - "result": { - "item": "mineralogy:drywall_gray" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:gray_dye" + } + ], + "result": { + "item": "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 32aaada88..751824b93 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_green.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_green.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/green" - } - ], - "result": { - "item": "mineralogy:drywall_green" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:green_dye" + } + ], + "result": { + "item": "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 59ab14314..01bbb4753 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,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/light_blue" - } - ], - "result": { - "item": "mineralogy:drywall_light_blue" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:light_blue_dye" + } + ], + "result": { + "item": "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 a55bfdf4f..d2bff8f9c 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_lime.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_lime.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/lime" - } - ], - "result": { - "item": "mineralogy:drywall_lime" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:lime_dye" + } + ], + "result": { + "item": "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 fbad8987b..a4b3a3223 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_magenta.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_magenta.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/magenta" - } - ], - "result": { - "item": "mineralogy:drywall_magenta" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:magenta_dye" + } + ], + "result": { + "item": "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 95d1de8f8..f8c6d266a 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_orange.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_orange.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/orange" - } - ], - "result": { - "item": "mineralogy:drywall_orange" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:orange_dye" + } + ], + "result": { + "item": "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 0abc3bdb7..336c92ec1 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_pink.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_pink.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/pink" - } - ], - "result": { - "item": "mineralogy:drywall_pink" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:pink_dye" + } + ], + "result": { + "item": "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 d8c661b9b..ea2741b0c 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_purple.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_purple.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/purple" - } - ], - "result": { - "item": "mineralogy:drywall_purple" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:purple_dye" + } + ], + "result": { + "item": "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 2b7c17b5f..3829ac0cb 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_red.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_red.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/red" - } - ], - "result": { - "item": "mineralogy:drywall_red" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:red_dye" + } + ], + "result": { + "item": "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 b294c3fde..45a92bff0 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_silver.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_silver.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/light_gray" - } - ], - "result": { - "item": "mineralogy:drywall_silver" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:light_gray_dye" + } + ], + "result": { + "item": "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 c8c6288df..73780e77d 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_white.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_white.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/white" - } - ], - "result": { - "item": "mineralogy:drywall_white" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:bone_meal" + } + ], + "result": { + "item": "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 240987a32..943bc64f3 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_yellow.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_yellow.json @@ -1,14 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:drywall_white" - }, - { - "tag": "forge:dyes/yellow" - } - ], - "result": { - "item": "mineralogy:drywall_yellow" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:yellow_dye" + } + ], + "result": { + "item": "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 7663c679a..a2222191e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..3c1426e6f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 a3447d73a..3d6316ad6 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_furnace", + "count": 1 + } } 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 ba498dace..857e440c3 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..7fe7fd19d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..0113d233d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_slab" + }, + { + "item": "mineralogy:gabbro_brick_slab" + } + ], + "result": { + "item": "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 be392c040..1cf859550 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..a76fb01be --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 fab4a716e..5b68ff740 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..13ea56e84 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 c66a0011d..3f9227e86 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/gabbro" - }, - { - "tag": "mineralogy:crafting_materials/gabbro" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gabbro" + }, + { + "tag": "mineralogy:stones/gabbro" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 5819bb8cc..05089e9a1 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json deleted file mode 100644 index 999a2f727..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..d018dadb3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..0fe13f140 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..cdd5a57d5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_slab" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..7e5c54664 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..0e4542ede --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_wall" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..c387ada98 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3d8f2cdf2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_slab" + }, + { + "item": "mineralogy:gabbro_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..54d09c450 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_slab" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..b277e7160 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..5d7c1af2a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_stairs" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..5c2c36db4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ce5f0825b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_wall" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_wall", + "count": 4 + } +} 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 230bffa26..7a1df82d9 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 eaf3d9394..7dc6ce043 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_blank", + "count": 16 + } } 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 c997d1d4d..6b914f7cd 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_cross", + "count": 4 + } } 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 79e417a36..5c923d40c 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_hammer", + "count": 7 + } } 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 8af08c84c..b4a937672 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 3b3a13098..e9557ed38 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_horizontal", + "count": 3 + } } 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 5d8ce99a2..c92c9e8fa 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_i", + "count": 7 + } } 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 c24288ecb..1f2db0cb4 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_left", + "count": 3 + } } 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 51ed81503..8273b9910 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 5fab88117..ca63bbe4b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_plus", + "count": 5 + } } 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 8647320d5..3a9e9cd53 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_left" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_left" + }, + { + "item": "mineralogy:gabbro_relief_left" + } + ], + "result": { + "item": "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 1b47b3800..1f535a655 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 7a6af6801..7c6929de7 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json index 41e2edbd3..132b00040 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json deleted file mode 100644 index 355dc3d51..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gabbro" - }, - "result": "mineralogy:gabbro_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json index e0243ad98..552e8bc0b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/gabbro" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gabbro" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 69ef58194..cde8c6303 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick", + "count": 4 + } } 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 7d81a257a..06109a209 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_furnace", + "count": 1 + } } 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 a2bd163cf..c3ea3eb3b 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 6 + } } 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 43f84439b..f0e8edf88 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 4 + } } 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 f480a1720..05b00ae09 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 6 + } } 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 db8186e2c..28b15b3ff 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_furnace", + "count": 1 + } } 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 03b68e8ad..e77cdf11e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_slab", + "count": 6 + } } 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 b2c18abfa..66770fcf2 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_stairs", + "count": 4 + } } 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 56af05be6..77d6a41aa 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json index 266295138..10baf2d63 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json deleted file mode 100644 index a44aa76b0..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gabbro" - }, - "result": "mineralogy:gabbro_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json index d14005662..8cc6a029e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json deleted file mode 100644 index eb20d6403..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gabbro" - }, - "result": "mineralogy:gabbro_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json index be4796332..1f2535044 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..1c5be4173 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 a1a82ecd2..b03f760d9 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_furnace", + "count": 1 + } } 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 9ebb6e086..f4ba04ba2 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..9a3b0389f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3a0a8d4e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_slab" + }, + { + "item": "mineralogy:gneiss_brick_slab" + } + ], + "result": { + "item": "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 16cb6db9e..a847b70f5 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..a0db79aad --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 e6e74e799..15f3f9a42 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..53565441e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 210c98653..bbb3d2767 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/gneiss" - }, - { - "tag": "mineralogy:crafting_materials/gneiss" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gneiss" + }, + { + "tag": "mineralogy:stones/gneiss" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 37fa86e59..954107e2f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json deleted file mode 100644 index b858bb92c..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..eebb0fcdb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f449f22ee --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..cdcaf87c3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_slab" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..139cea5be --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..98b140c12 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_wall" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..e73914b71 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3bf2bdb3b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_slab" + }, + { + "item": "mineralogy:gneiss_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..8eae122de --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_slab" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d5a8f61b4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ffd9be83c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_stairs" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..31d11e6bc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..c4afc178d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_wall" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_wall", + "count": 4 + } +} 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 211a42cef..0dbfaf824 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 c5bd379d7..c259cd6f3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_blank", + "count": 16 + } } 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 76b504e8c..d01da19f7 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_cross", + "count": 4 + } } 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 46d3248f5..67a739bc3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_hammer", + "count": 7 + } } 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 5496f76d8..de83567d0 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 9530f2df7..80aa6ca68 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_horizontal", + "count": 3 + } } 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 6623eaf15..4ae29a475 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_i", + "count": 7 + } } 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 b2e52f992..7dbb2c5bf 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_left", + "count": 3 + } } 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 f00c7b21b..666247ca9 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 df66616ea..15d6dfd5c 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_plus", + "count": 5 + } } 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 037381062..3b6cb632f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_left" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_left" + }, + { + "item": "mineralogy:gneiss_relief_left" + } + ], + "result": { + "item": "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 816de9d79..d0c9eb2e4 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 18cc58bf5..4206088f6 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json index 103b2496f..e21822575 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json deleted file mode 100644 index 1a5607d16..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gneiss" - }, - "result": "mineralogy:gneiss_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json index db53720df..e761461d4 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/gneiss" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gneiss" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 c5e29db5e..8d4b39b21 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick", + "count": 4 + } } 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 b131b8c5e..d17678a93 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_furnace", + "count": 1 + } } 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 cc0578b2c..e2104be2c 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 6 + } } 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 f41fc6e8a..0b8d9f3a8 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 4 + } } 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 08464ea62..8e26b543c 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 6 + } } 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 017eb4b2c..c0c91da6f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_furnace", + "count": 1 + } } 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 d9c5995d7..35afc97a7 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_slab", + "count": 6 + } } 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 fbbae3f80..0e06e380f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_stairs", + "count": 4 + } } 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 51903c750..3425f55cf 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json index f760bab27..3e7d0de00 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json deleted file mode 100644 index 5b05aee18..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gneiss" - }, - "result": "mineralogy:gneiss_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json index 186d0bda2..ff2a6b254 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json deleted file mode 100644 index ea6a8c4af..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gneiss" - }, - "result": "mineralogy:gneiss_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick.json b/src/main/resources/data/mineralogy/recipes/granite_brick.json index ef2d2f2a7..d8db2c9c3 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite" + } + }, + "result": { + "item": "mineralogy:granite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..b52ecc6ab --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 43756fcaf..8a0cba0b9 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_brick_furnace", + "count": 1 + } } 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 186d87bab..b1ac97f5a 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..1149031e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..043e54604 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_slab" + }, + { + "item": "mineralogy:granite_brick_slab" + } + ], + "result": { + "item": "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 6f955f44b..673d62abe 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..8fc1602a4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 70800d72d..555850692 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..a14d8eb84 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 f5136c974..cccddd42d 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/granite" - }, - { - "tag": "mineralogy:crafting_materials/granite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/granite" + }, + { + "tag": "mineralogy:stones/granite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 9ed5644f3..7f62048ca 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json deleted file mode 100644 index 4c50b2c12..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/granite" - } - }, - "result": { - "item": "mineralogy:granite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..4b3494ebf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..8db726bd6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_slab" + }, + { + "item": "mineralogy:granite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..446b3e78c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..000ecac67 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..0ead7cd3d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a39724156 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..af2493299 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + }, + { + "item": "mineralogy:granite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..21930053f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_slab" + } + }, + "result": { + "item": "mineralogy:granite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..122baa403 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e9b0e5fe7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_stairs" + } + }, + "result": { + "item": "mineralogy:granite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..50ddb8677 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3258012bc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_wall" + } + }, + "result": { + "item": "mineralogy:granite_brick_wall", + "count": 4 + } +} 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 e8bf723d7..3d4c0684f 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:granite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 5f6fd7899..1562b773c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_relief_blank", + "count": 16 + } } 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 0a742c168..871a49361 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_cross", + "count": 4 + } } 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 52b8a920f..02bcfa913 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_hammer", + "count": 7 + } } 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 bb9bb7683..cf895d384 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:granite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 705039aa4..f71682bc7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_horizontal", + "count": 3 + } } 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 dca5b6348..8144dcbce 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_i", + "count": 7 + } } 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 f9a40448a..95559c1ba 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_left", + "count": 3 + } } 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 c80d184a2..1c220a905 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:granite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 0094fdb2a..2c8c022eb 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_plus", + "count": 5 + } } 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 280a02fc4..bb78a9b62 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_left" - } - }, - "result": { - "item": "mineralogy:granite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_left" + }, + { + "item": "mineralogy:granite_relief_left" + } + ], + "result": { + "item": "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 7d4fc4be6..bbcf24c37 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:granite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 797205d77..912259743 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab.json b/src/main/resources/data/mineralogy/recipes/granite_slab.json index 07927a17b..983fea31e 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite" + } + }, + "result": { + "item": "mineralogy:granite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json deleted file mode 100644 index 532306f23..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_slab", - "count": 2 - } - } - ] -} 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 new file mode 100644 index 000000000..c91bd5197 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:granite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..20b240929 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + } + ], + "result": { + "item": "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 00029faa3..46dd14f50 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/granite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 bb644f5b9..d931e6f6a 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick", + "count": 4 + } } 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 2264cdab9..5c8869ca1 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_furnace", + "count": 1 + } } 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 49ed02172..a24e12384 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 6 + } } 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 9a6934c71..f2d992fb7 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 4 + } } 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 691c3436c..cfc405fd7 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 6 + } } 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 a02e057d4..74f00a684 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_smooth_furnace", + "count": 1 + } } 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 4fd817e85..fec76f32d 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..424d64000 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_granite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d18a21346 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_slab" + } + ], + "result": { + "item": "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 8e905eebf..cccefe463 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_stairs", + "count": 4 + } } 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 c820f1a59..27e60ecdf 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_stairs.json index 38bd8954d..2555a1fbd 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite" + } + }, + "result": { + "item": "mineralogy:granite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json deleted file mode 100644 index 7a86089ac..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall.json b/src/main/resources/data/mineralogy/recipes/granite_wall.json index 4664e82d8..85a3d87a7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite" + } + }, + "result": { + "item": "mineralogy:granite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json deleted file mode 100644 index ef079dbc3..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_wall", - "count": 1 - } - } - ] -} 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 e8e3c5ecc..64b3311ea 100644 --- a/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json @@ -1,22 +1,15 @@ { - "type": "forge:conditional", - "recipes": [ + "type": "minecraft:smelting", + "ingredient": { + "item": "minecraft:gravel" + }, + "result": "minecraft:stone", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "SMELTABLE_GRAVEL" - } - ], - "recipe": { - "type": "minecraft:smelting", - "ingredient": { - "item": "minecraft:gravel" - }, - "result": "minecraft:stone", - "experience": 0.1, - "cookingtime": 200 - } + "type": "mineralogy:config", + "flag": "SMELTABLE_GRAVEL" } ] } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json deleted file mode 100644 index 55a7c0a9c..000000000 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/carbon" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "minecraft:gunpowder", - "count": 4 - } -} 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 new file mode 100644 index 000000000..42d698ab2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/carbon" + } + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/carbon" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ed887d527 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json @@ -0,0 +1,24 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:charcoal" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal.json deleted file mode 100644 index 9a470320b..000000000 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:coal" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "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 new file mode 100644 index 000000000..099f13913 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/coal" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "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 2b25af923..3ee7e98d3 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json @@ -1,18 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:sugar" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "minecraft:gunpowder", - "count": 4 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:sugar" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "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 5bb619aad..49bc08363 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum.json @@ -1,16 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/gypsum" - } - }, - "result": { - "item": "mineralogy:gypsum" - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:dusts/gypsum" + } + }, + "result": { + "item": "mineralogy:gypsum", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json index 9d5adb223..7781a6191 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json @@ -1,12 +1,18 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/gypsum" - } - ], - "result": { - "item": "mineralogy:gypsum_dust", - "count": 9 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/gypsum" + } + ], + "result": { + "item": "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 01bfa0585..f8d6e9fb1 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..2c50cad38 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 6647c9a09..5afa377cd 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_furnace", + "count": 1 + } } 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 24fa46592..0184a0a4e 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..0aff8fe33 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ace699124 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_slab" + }, + { + "item": "mineralogy:hornfels_brick_slab" + } + ], + "result": { + "item": "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 4c6a29a59..92ce98d42 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..dbcafa427 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 7a2b8a533..d64ef4d0d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..aab0ddcae --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 93bfdb765..977936bbc 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/hornfels" - }, - { - "tag": "mineralogy:crafting_materials/hornfels" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/hornfels" + }, + { + "tag": "mineralogy:stones/hornfels" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 4cc767d88..70d532ca4 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json deleted file mode 100644 index 3023923c6..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..593aba083 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..98825b88f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..c46470ad5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_slab" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..b2e0d4a7d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..6b7d6b48d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_wall" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..2db90a7df --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..19ef6a95b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_slab" + }, + { + "item": "mineralogy:hornfels_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..5f0d54e87 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_slab" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..bf416d1ef --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..7d80b58c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_stairs" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..99caf45da --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..9fe737405 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_wall" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_wall", + "count": 4 + } +} 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 bc8284da9..885324663 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 282e1c5df..e64e141ac 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_blank", + "count": 16 + } } 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 b5fec7612..25f271d91 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_cross", + "count": 4 + } } 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 16e9a419a..ce0bddfa9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_hammer", + "count": 7 + } } 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 c2c79fadf..bf86b4262 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 23217574a..9f11d2e1c 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_horizontal", + "count": 3 + } } 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 3cdaf3074..5c8d9c3d6 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_i", + "count": 7 + } } 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 fdcf382ee..ff3ac9084 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_left", + "count": 3 + } } 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 c248a733e..9622f3a87 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 f8743797a..2f730dcfd 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_plus", + "count": 5 + } } 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 7740f370b..e362ca6c3 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_left" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_left" + }, + { + "item": "mineralogy:hornfels_relief_left" + } + ], + "result": { + "item": "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 d996cf08c..33b3a9714 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 c9940ca72..a72a92849 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json index 9a362695e..97d9a44da 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json b/src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json deleted file mode 100644 index 0a55432fc..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/hornfels" - }, - "result": "mineralogy:hornfels_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json index 5213ec679..1652aaed6 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/hornfels" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/hornfels" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 74f30e352..7ef199fe9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick", + "count": 4 + } } 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 3848a9413..6930a32c7 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_furnace", + "count": 1 + } } 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 6bd46b7f9..4906dd00f 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 6 + } } 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 0c84a292a..022e9b439 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 4 + } } 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 543cc3c4e..19eec32c2 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 6 + } } 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 71ba2a978..ed333b061 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_furnace", + "count": 1 + } } 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 48150f032..6cd63acce 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_slab", + "count": 6 + } } 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 690f70729..bf7db1054 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_stairs", + "count": 4 + } } 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 7c29ac7ff..de7ddaa16 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json index 2eaacf0e7..08fc9f132 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json b/src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json deleted file mode 100644 index 7c4a6399d..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/hornfels" - }, - "result": "mineralogy:hornfels_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json index d83a51860..c11e942a9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json b/src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json deleted file mode 100644 index 2b5df1346..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/hornfels" - }, - "result": "mineralogy:hornfels_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_brick.json index 7b28ddc08..d00b2dff9 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..c106ee58c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 8bb720fce..1d0e6babe 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_brick_furnace", + "count": 1 + } } 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 87153ea42..dc1140125 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..a3f514e1c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3c6a01b24 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_slab" + }, + { + "item": "mineralogy:limestone_brick_slab" + } + ], + "result": { + "item": "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 0360e9d3d..6741a0946 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..92c7f3360 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 618dc7a57..076a17f19 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..670f0064b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 68e457a80..729517842 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/limestone" - }, - { - "tag": "mineralogy:crafting_materials/limestone" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/limestone" + }, + { + "tag": "mineralogy:stones/limestone" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 f7e50a85b..c3a2bd0ed 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json deleted file mode 100644 index 170d6b687..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..72403b6cb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..61d71ea3b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_smooth_slab" + }, + { + "item": "mineralogy:limestone_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..c0de89c9e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_slab" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..c04b941ed --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..b81a48d59 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_wall" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..186758820 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..2828ab5c1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_slab" + }, + { + "item": "mineralogy:limestone_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..5b4e52f9a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_slab" + } + }, + "result": { + "item": "mineralogy:limestone_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..663a25353 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e088307f3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_stairs" + } + }, + "result": { + "item": "mineralogy:limestone_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..9b6ac5953 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..0c927507c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_wall" + } + }, + "result": { + "item": "mineralogy:limestone_brick_wall", + "count": 4 + } +} 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 63e57191e..4278d904a 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 ae2018ea8..96c4b17dc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + } + }, + "result": { + "item": "mineralogy:limestone_relief_blank", + "count": 16 + } } 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 0196b12b2..302ed4ae0 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_cross", + "count": 4 + } } 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 b911b5fb6..3b5e960f8 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_hammer", + "count": 7 + } } 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 9a014f98a..ae6939ee5 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 6df8a6df5..11835e0bc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_horizontal", + "count": 3 + } } 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 0f5c9d59a..65038cbfd 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_i", + "count": 7 + } } 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 7b68d30ef..fb171e5ee 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_left", + "count": 3 + } } 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 e59235a75..d7080e909 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 d4e898cb0..b871e57de 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_plus", + "count": 5 + } } 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 14c9249b5..acd2f73cc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_left" - } - }, - "result": { - "item": "mineralogy:limestone_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_left" + }, + { + "item": "mineralogy:limestone_relief_left" + } + ], + "result": { + "item": "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 7a6fa051d..ca8807f59 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:limestone_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 2f26278af..c3186e2f1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_slab.json index ecff1e29e..b24e15ff9 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone" + } + }, + "result": { + "item": "mineralogy:limestone_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json deleted file mode 100644 index 54fcd4f47..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/limestone" - }, - "result": "mineralogy:limestone_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json index d9ff74cad..1c7c6332e 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/limestone" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/limestone" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 f12b20686..ac4f2edda 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick", + "count": 4 + } } 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 cda60b0f7..2179b0f8c 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_furnace", + "count": 1 + } } 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 ec617bb05..7114d4e5a 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 6 + } } 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 b22ad78eb..3db29b699 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 4 + } } 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 87726f05f..dad0b8f2d 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 6 + } } 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 9b5cb6d26..205cbd0f5 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_furnace", + "count": 1 + } } 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 f2d3012f9..1963c2b22 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_slab", + "count": 6 + } } 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 753a17853..d91a616b2 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_stairs", + "count": 4 + } } 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 a263f2fac..2834737c1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json index 0d1d09c18..e0d7ffa4d 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json deleted file mode 100644 index 85ab9faac..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/limestone" - }, - "result": "mineralogy:limestone_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_wall.json index 5879f4307..a008dbee3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json deleted file mode 100644 index d3f33b599..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/limestone" - }, - "result": "mineralogy:limestone_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick.json b/src/main/resources/data/mineralogy/recipes/marble_brick.json index 3d453b2e4..76c7dd433 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..615650bba --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 07a39b0f7..cf13e4059 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_brick_furnace", + "count": 1 + } } 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 21172dd03..3bc7e6fa9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..2f6b11723 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ea20aea9a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_slab" + }, + { + "item": "mineralogy:marble_brick_slab" + } + ], + "result": { + "item": "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 85be55beb..02053f937 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..d9831b67e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 9f949fcc7..9c73c0193 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..f90891490 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 4789d3e55..9e3ce5775 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/marble" - }, - { - "tag": "mineralogy:crafting_materials/marble" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/marble" + }, + { + "tag": "mineralogy:stones/marble" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 6ece28aeb..c5980f8db 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json deleted file mode 100644 index 550ee18d6..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..62831d180 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ae2ec05a9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_smooth_slab" + }, + { + "item": "mineralogy:marble_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..526aa316f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_slab" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..0c080b93b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..5fef3df58 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_wall" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..ce2f649cf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..459ee49ab --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_slab" + }, + { + "item": "mineralogy:marble_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1ba3f4b72 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_slab" + } + }, + "result": { + "item": "mineralogy:marble_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a8e1d29e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..4d8d81a13 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_stairs" + } + }, + "result": { + "item": "mineralogy:marble_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..5a101579e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..88635d0e3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_wall" + } + }, + "result": { + "item": "mineralogy:marble_brick_wall", + "count": 4 + } +} 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 b2c8f57a0..b89b95fce 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:marble_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 9f32f6f8f..b13cf5008 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + } + }, + "result": { + "item": "mineralogy:marble_relief_blank", + "count": 16 + } } 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 ea3a54b54..29bdb8d63 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_cross", + "count": 4 + } } 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 94b7dbc46..c3a205aa4 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_hammer", + "count": 7 + } } 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 fb4deb5df..ff6d74c1e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:marble_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 08505348a..bc2f52a18 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_horizontal", + "count": 3 + } } 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 0673774b4..8d0f2b3e0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_i", + "count": 7 + } } 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 64f58a43c..8e8ac68b5 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_left", + "count": 3 + } } 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 1967b854e..c86a26227 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:marble_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 a4437e7ac..5b493b515 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_plus", + "count": 5 + } } 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 2ec41db2b..02f0d4f1f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_left" - } - }, - "result": { - "item": "mineralogy:marble_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_left" + }, + { + "item": "mineralogy:marble_relief_left" + } + ], + "result": { + "item": "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 fc9727ebe..53a063d5a 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:marble_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 af67eb024..b06f013d2 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_slab.json b/src/main/resources/data/mineralogy/recipes/marble_slab.json index 6db31a876..5f170be5f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble" + } + }, + "result": { + "item": "mineralogy:marble_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json b/src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json deleted file mode 100644 index 3635a8ffc..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/marble" - }, - "result": "mineralogy:marble_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/recipes/marble_smooth.json index 88869e645..593043ba9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/marble" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/marble" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 d1ecd24f5..05e868c3b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick", + "count": 4 + } } 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 eacac35b3..3bccae88a 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_furnace", + "count": 1 + } } 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 52879cf5e..b0605bf1f 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 6 + } } 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 ff1138d76..8f4a0db13 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 4 + } } 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 e0cd8f858..e816b0f6b 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 6 + } } 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 41b9310a0..b025120e0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_smooth_furnace", + "count": 1 + } } 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 0c3fc93cc..df89e9bcd 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_slab", + "count": 6 + } } 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 88a51b3d7..67c4ccca9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_stairs", + "count": 4 + } } 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 2c5ed67fe..55c696ed7 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_stairs.json index f476e072e..346890345 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json b/src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json deleted file mode 100644 index a470c2389..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/marble" - }, - "result": "mineralogy:marble_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_wall.json b/src/main/resources/data/mineralogy/recipes/marble_wall.json index 5d292b64d..1d1d3b41d 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json b/src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json deleted file mode 100644 index 2630d0b26..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/marble" - }, - "result": "mineralogy:marble_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/mineral_fertilizer.json b/src/main/resources/data/mineralogy/recipes/mineral_fertilizer.json deleted file mode 100644 index 8416947cf..000000000 --- a/src/main/resources/data/mineralogy/recipes/mineral_fertilizer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/phosphorous" - } - ], - "result": { - "item": "mineralogy:mineral_fertilizer" - } -} diff --git a/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json new file mode 100644 index 000000000..6f9e494ac --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/phosphorous" + } + ], + "result": { + "item": "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 2d9a73f50..17ae1ca6b 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_block.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_block.json @@ -1,16 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/nitrate" - } - }, - "result": { - "item": "mineralogy:nitrate_block" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:nitrate_dust" + } + }, + "result": { + "item": "mineralogy:nitrate_block", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json index 94f98e8d8..c8d4a6c09 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json @@ -1,12 +1,22 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/nitrate" - } - ], - "result": { - "item": "mineralogy:nitrate_dust", - "count": 9 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/nitrate" + } + ], + "result": { + "item": "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 37d027a63..8bd5b0d80 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..99ea3c668 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 f67009d9e..4f10ba709 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_furnace", + "count": 1 + } } 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 50d32d5c6..81af5a568 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..8344b7c93 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..150f4c402 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_slab" + }, + { + "item": "mineralogy:novaculite_brick_slab" + } + ], + "result": { + "item": "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 036111585..31275a6cc 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..bc8c2303b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 ab72a1945..2f6da80fe 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..c4f7e9614 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 ddcef1ebe..9a8da12ee 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/novaculite" - }, - { - "tag": "mineralogy:crafting_materials/novaculite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/novaculite" + }, + { + "tag": "mineralogy:stones/novaculite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 b8889426e..940c68acb 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json deleted file mode 100644 index fb54973ec..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..5b544f41b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..19d83bc7c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..97c598666 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..c5935de5a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..693faa04a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..74deeb8ab --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..422504daa --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_slab" + }, + { + "item": "mineralogy:novaculite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..021f3ac37 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_slab" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..beaeca0db --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1eeaf6b2f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_stairs" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..3edf236d8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..08f5bdd8d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_wall" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_wall", + "count": 4 + } +} 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 7cb1c1cf7..bb0001d97 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 567ab3f19..1fb5e51ba 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_blank", + "count": 16 + } } 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 7f79c6384..f4c0bec4b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_cross", + "count": 4 + } } 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 fc621f422..53ff2e71b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_hammer", + "count": 7 + } } 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 afb042bed..53417aa38 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 52728ca22..9ca794140 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_horizontal", + "count": 3 + } } 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 6e09ca570..b18e022f6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_i", + "count": 7 + } } 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 18d9ce481..bebc532c6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_left", + "count": 3 + } } 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 90678f931..6c4417311 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 9c13967fb..d32d11a4a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_plus", + "count": 5 + } } 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 1cff6762f..3e315cab6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_left" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_left" + }, + { + "item": "mineralogy:novaculite_relief_left" + } + ], + "result": { + "item": "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 0f6db09ae..f5827c283 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 4b0bfefbe..c78629d17 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json index 60b0747cc..0b12e568a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json deleted file mode 100644 index 66dcc2521..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/novaculite" - }, - "result": "mineralogy:novaculite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json index cfd80a614..2bb4fd011 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/novaculite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/novaculite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 20cb3130e..dabdca75e 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick", + "count": 4 + } } 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 622548842..a8b83c2c9 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_furnace", + "count": 1 + } } 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 d4190d4cd..d3ce495ee 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 6 + } } 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 2b4d25b5a..9fb78eedb 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 4 + } } 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 b3490e86f..0d30014ed 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 6 + } } 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 79102376d..13e1e27b6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_furnace", + "count": 1 + } } 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 188591ca7..e7f1bf2b6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_slab", + "count": 6 + } } 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 f07aec03b..9fa878a00 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_stairs", + "count": 4 + } } 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 c4be97fc1..447d86dfa 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json index a8414e018..0ea6b8346 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json deleted file mode 100644 index 497558edc..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/novaculite" - }, - "result": "mineralogy:novaculite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json index d4d25d96e..0e1336682 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json deleted file mode 100644 index cd3a39530..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/novaculite" - }, - "result": "mineralogy:novaculite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json index 9d789ce78..9c50371d2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..66de263cc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 17124db45..061342200 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_furnace", + "count": 1 + } } 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 ff922750c..2636188f3 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..47cfe8b4a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..39e44bd1a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "result": { + "item": "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 6718c41fc..6fe25be37 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..d1c04d873 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 84d4064e8..4f48e7878 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..39699e075 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 a9cf4e5b9..77a1ec268 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/pegmatite" + }, + { + "tag": "mineralogy:stones/pegmatite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 b4772ba8e..0c1780dfe 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json deleted file mode 100644 index f4f1687d4..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..d4ba86311 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..a940969df --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..b1fe90e3e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..cde3fecee --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..41f26f74c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..343766bfd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..36d0d3133 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_slab" + }, + { + "item": "mineralogy:pegmatite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..46e06c578 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_slab" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..adc9d51e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d23153915 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_stairs" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..3314e4d3c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..dcc49a9d2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_wall" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_wall", + "count": 4 + } +} 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 96b7a10fa..2020c49df 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 9481a40ff..404aa78fd 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_blank", + "count": 16 + } } 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 4d3d012b3..e4bb4b025 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_cross", + "count": 4 + } } 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 223fde7e9..967e4e643 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_hammer", + "count": 7 + } } 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 68ae5309b..572d850cc 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 29aae5325..f8d71228f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_horizontal", + "count": 3 + } } 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 b5e0091d4..d2b6bac83 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_i", + "count": 7 + } } 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 cc4697e46..7d75355d2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_left", + "count": 3 + } } 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 be5598a51..5025576c2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 c050dabf1..718d3edcf 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_plus", + "count": 5 + } } 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 6a794203b..98ca59f8f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_left" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_left" + }, + { + "item": "mineralogy:pegmatite_relief_left" + } + ], + "result": { + "item": "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 a9287c5e0..2249b99aa 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 bd2c68fe9..0001d529a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json index 1de7cfed5..22fd121ad 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json deleted file mode 100644 index 75ea50a79..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - "result": "mineralogy:pegmatite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json index a87c062a7..8d8ad449e 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/pegmatite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 e3be488f2..e78453ed4 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick", + "count": 4 + } } 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 57ad5f5a2..9255dd16b 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_furnace", + "count": 1 + } } 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 bda37c38d..958619679 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 6 + } } 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 fea77c2c6..81178a6ab 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 4 + } } 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 d28b04493..3bcb15218 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 6 + } } 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 13a733ee6..41aef14bb 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_furnace", + "count": 1 + } } 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 f7ba8959f..245c19d58 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_slab", + "count": 6 + } } 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 519d22921..88e487bd0 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_stairs", + "count": 4 + } } 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 5083a4ecf..6b6cb1859 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json index f140c3d1c..6b750b565 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json deleted file mode 100644 index c28271f80..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - "result": "mineralogy:pegmatite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json index e4ee88436..0fe71f344 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json deleted file mode 100644 index d3b4d6265..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - "result": "mineralogy:pegmatite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json index d1f97d0c9..762e63fab 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..c0e919f2e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 f5a6e6cbe..d9dad9f1c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_furnace", + "count": 1 + } } 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 f01aefb29..6a2bc334e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..27d157b14 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..5de82722c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_slab" + }, + { + "item": "mineralogy:peridotite_brick_slab" + } + ], + "result": { + "item": "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 b18e4b4df..650b61b6c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..1e4514fcc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 d4d2251cd..509285998 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..52747be2c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 d3ccef1b7..7d9235362 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/peridotite" - }, - { - "tag": "mineralogy:crafting_materials/peridotite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/peridotite" + }, + { + "tag": "mineralogy:stones/peridotite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 2fd14f261..3ee6fd973 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json deleted file mode 100644 index e235b248e..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..36b4e42b8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1b2ab034b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..02b3501e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..5c886fadc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..cc5c0a396 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..7b02a049d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..67f0a111b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_slab" + }, + { + "item": "mineralogy:peridotite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..2420eaf70 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_slab" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..7201d0006 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..c98c47bd7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_stairs" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..2b5cf1997 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..12704ace6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_wall" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_wall", + "count": 4 + } +} 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 9f93bde0e..5acc10200 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 8fb57a8a2..b6af4a866 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_blank", + "count": 16 + } } 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 187fb0846..d5774f6fc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_cross", + "count": 4 + } } 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 c5951c183..7205fa4fc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_hammer", + "count": 7 + } } 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 b3e8a26c8..26e25eecf 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 c7255cec4..50283598e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_horizontal", + "count": 3 + } } 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 3e0f6b7e4..60fbd5914 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_i", + "count": 7 + } } 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 7b3fc457e..131ba06c6 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_left", + "count": 3 + } } 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 59c261ef0..a658d0084 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 fd81dedad..97cc0cefb 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_plus", + "count": 5 + } } 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 424894cdf..0d1e881a9 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_left" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_left" + }, + { + "item": "mineralogy:peridotite_relief_left" + } + ], + "result": { + "item": "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 705284bbf..648d1e8c8 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 05b5e1844..a5868d89e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json index 92301341a..4fb6b92b7 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json deleted file mode 100644 index f2e505829..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/peridotite" - }, - "result": "mineralogy:peridotite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json index c8ff4eea0..bbb861772 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/peridotite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/peridotite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 42a65bfdf..341608027 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick", + "count": 4 + } } 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 2f6eb521e..ef015aba0 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_furnace", + "count": 1 + } } 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 58affaf1d..8ffdc0497 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 6 + } } 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 dcc9c49a1..dd4590cd9 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 4 + } } 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 aaeba01a6..522a56d49 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 6 + } } 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 3ea97fe12..34dfc218c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_furnace", + "count": 1 + } } 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 56d273666..aac944a6c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_slab", + "count": 6 + } } 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 f1769da9e..5f77a1e53 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_stairs", + "count": 4 + } } 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 f1c203e40..30d8b97a1 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json index aba8814d5..13d92d8f3 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json deleted file mode 100644 index f344b0fe6..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/peridotite" - }, - "result": "mineralogy:peridotite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json index 582ca95a4..5c16d1139 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json deleted file mode 100644 index 82eef2347..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/peridotite" - }, - "result": "mineralogy:peridotite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json index 92b40456f..f5a0a15ac 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json @@ -1,16 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/phosphorous" - } - }, - "result": { - "item": "mineralogy:phosphorous_block" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phosphorous_dust" + } + }, + "result": { + "item": "mineralogy:phosphorous_block", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json index 0937f7af7..a24fe4a77 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json @@ -1,12 +1,22 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/phosphorous" - } - ], - "result": { - "item": "mineralogy:phosphorous_dust", - "count": 9 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/phosphorous" + } + ], + "result": { + "item": "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 b8c642850..8cde90e8f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..6362b9add --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 a2817aca8..735385973 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_furnace", + "count": 1 + } } 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 8da8e5b05..d6463f2a5 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..bb240aef9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..c78b2e2e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_slab" + }, + { + "item": "mineralogy:phyllite_brick_slab" + } + ], + "result": { + "item": "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 235097d1e..440474ddf 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..95bec7b7c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 0e6760dfe..301ed982a 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..4f7e9ac9d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 d724d4952..a0a5cdc5d 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/phyllite" - }, - { - "tag": "mineralogy:crafting_materials/phyllite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/phyllite" + }, + { + "tag": "mineralogy:stones/phyllite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 2d89e4e8d..19c4dc5dd 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json deleted file mode 100644 index fa6802d77..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..413330f19 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..81439fb14 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f75e9e237 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..fd1316b60 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..fd1ef3515 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..850b8ac45 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..94dea2652 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_slab" + }, + { + "item": "mineralogy:phyllite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ee3f409ba --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_slab" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d3f283745 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..7e67846bd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_stairs" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..e1bcf09d5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..8c201e293 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_wall" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_wall", + "count": 4 + } +} 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 6d9d024b6..b1a2e2bd0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 47dd4c62a..a6214c023 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_blank", + "count": 16 + } } 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 3b13e8404..cd7c65242 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_cross", + "count": 4 + } } 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 3f2a76d68..c6f95e421 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_hammer", + "count": 7 + } } 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 d9b04aaaf..3174799b0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 ba147f305..c993ae66a 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_horizontal", + "count": 3 + } } 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 7166781d1..e542e6cad 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_i", + "count": 7 + } } 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 abc0fe39e..2c8aabba2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_left", + "count": 3 + } } 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 136219691..b59dfd460 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 f62a622f5..347a951b7 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_plus", + "count": 5 + } } 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 095f57504..ec429f83e 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_left" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_left" + }, + { + "item": "mineralogy:phyllite_relief_left" + } + ], + "result": { + "item": "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 60a43cea3..b96c614c2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 47d3f4aca..6bf3aa063 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json index 3e05de0b7..2d8086d9f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json deleted file mode 100644 index d30825141..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/phyllite" - }, - "result": "mineralogy:phyllite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json index 8bada6c0c..ad750a9f7 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/phyllite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/phyllite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 c6b2f1dea..b63145c51 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick", + "count": 4 + } } 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 adc2371b7..4f4e20be0 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_furnace", + "count": 1 + } } 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 e52be8e1a..48f772b07 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 6 + } } 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 96579145a..5fbf7a716 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 4 + } } 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 7402fd13d..3d96a164c 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 6 + } } 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 df8ae65b7..832a404e9 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_furnace", + "count": 1 + } } 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 2eef86cef..4dd48a01c 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_slab", + "count": 6 + } } 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 149d7bf80..a243eb250 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_stairs", + "count": 4 + } } 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 81e058670..b6673039f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json index 132bd081d..3c6089f70 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json deleted file mode 100644 index d5995cea8..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/phyllite" - }, - "result": "mineralogy:phyllite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json index 57805f2e0..3b96dff85 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json deleted file mode 100644 index d1a5e36b6..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/phyllite" - }, - "result": "mineralogy:phyllite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json index c1235bc67..c16f054b0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..be2f1ceaf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 ab0ce0205..fd27d1d68 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_furnace", + "count": 1 + } } 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 b9659b930..bb40073f4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..0dd4d96d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..687018811 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_slab" + }, + { + "item": "mineralogy:quartzite_brick_slab" + } + ], + "result": { + "item": "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 bca9e0282..2b7c70457 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..4217ccc4f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 1689cf22e..06d8bd760 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..3ced117fb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 7228c72b6..d9bc16ae0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/quartzite" - }, - { - "tag": "mineralogy:crafting_materials/quartzite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/quartzite" + }, + { + "tag": "mineralogy:stones/quartzite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 aa6b73a76..3bcd85ee9 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json deleted file mode 100644 index 42ff1458d..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..688ac8628 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..2e878923d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..97765627e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..5dbc17ede --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a52b08ab6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..3c6807375 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..6f36584e0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_slab" + }, + { + "item": "mineralogy:quartzite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..4145302e2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_slab" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..e797389f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..0cbe1f8ae --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_stairs" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..551f58408 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..edb0ae0f7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_wall" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_wall", + "count": 4 + } +} 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 132d8b07c..b46b28548 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 406a4b976..458800dad 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_blank", + "count": 16 + } } 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 c75064056..788af0c5c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_cross", + "count": 4 + } } 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 be9175874..dd99ca6fe 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_hammer", + "count": 7 + } } 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 4780c016f..c48d7555c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 970498214..31002bb71 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_horizontal", + "count": 3 + } } 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 7d348f7d5..91b353561 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_i", + "count": 7 + } } 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 8a59fb051..8d3db257f 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_left", + "count": 3 + } } 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 47a5238f5..c8540c543 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 292f6c947..a57fb11df 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_plus", + "count": 5 + } } 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 9f84e57b4..777ae7393 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_left" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_left" + }, + { + "item": "mineralogy:quartzite_relief_left" + } + ], + "result": { + "item": "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 adcdcce0b..4c6565041 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 283dbc478..cffadc5cb 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json index 38c95aa48..7014ce23e 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json deleted file mode 100644 index 1a0928faa..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/quartzite" - }, - "result": "mineralogy:quartzite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json index 07f560626..1daaa6690 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/quartzite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/quartzite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 55d7c0cb2..b77274bf7 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick", + "count": 4 + } } 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 4e40f1536..0fdc35ebc 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_furnace", + "count": 1 + } } 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 5432ec8b0..b27d018f5 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 6 + } } 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 41ab13288..192c63327 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 4 + } } 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 a59e87217..f243c02a3 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 6 + } } 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 b32bb0923..5b876940f 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_furnace", + "count": 1 + } } 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 60e6b0b5a..31abc3f32 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_slab", + "count": 6 + } } 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 d6bee65a2..ca86bddd5 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_stairs", + "count": 4 + } } 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 c6415f819..f38a422d4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json index 35c489994..61a0ddad2 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json deleted file mode 100644 index 784c4eeb1..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/quartzite" - }, - "result": "mineralogy:quartzite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json index 06260b1a6..9f3c061b6 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json deleted file mode 100644 index e36acc232..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/quartzite" - }, - "result": "mineralogy:quartzite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json index 9fe2a8d81..cd57cd10d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..0f28df821 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 59caf5915..0d45d83c5 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_furnace", + "count": 1 + } } 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 2cd11f6c2..62d875a65 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..1f8f35384 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d467db70f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "result": { + "item": "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 29327380a..fc58b3042 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..6dbcdedcf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 628743e9c..d56d02675 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..bea252510 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 8dc0e9d2c..653c137a7 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rhyolite" + }, + { + "tag": "mineralogy:stones/rhyolite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 0e3fac2c5..b3c85dc8b 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json deleted file mode 100644 index 2f0a4678a..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..f7726df1b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..787728ea2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..304a10120 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..885cca5e0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..06712dcfd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..4140bf23f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..69f1bb1b2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_slab" + }, + { + "item": "mineralogy:rhyolite_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..7231e5db9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_slab" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..32ec96346 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d24d45da4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_stairs" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d1f3fd1a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d4d343ba1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_wall" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_wall", + "count": 4 + } +} 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 31ec846df..41eae33db 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 989ffe39b..441cefca0 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_blank", + "count": 16 + } } 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 534a432c3..59e19a619 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_cross", + "count": 4 + } } 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 56542432b..ba00ebf57 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_hammer", + "count": 7 + } } 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 1dd7d6665..d2333bf8d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 234ec04a7..e22aa8319 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_horizontal", + "count": 3 + } } 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 8d6ace499..50e1a174e 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_i", + "count": 7 + } } 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 c76346b3f..285ee5b35 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_left", + "count": 3 + } } 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 d0b6e761b..4faa5a864 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 e5a9ff54e..49381b9c9 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_plus", + "count": 5 + } } 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 e12be459f..0a5e32204 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_left" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_left" + }, + { + "item": "mineralogy:rhyolite_relief_left" + } + ], + "result": { + "item": "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 7cea17c0b..6c6e5d18c 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 6e908441f..9cebdc951 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json index c098faa26..583f63f1d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json deleted file mode 100644 index 9b4ed0f26..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - "result": "mineralogy:rhyolite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json index 0d90591df..f5c29ca51 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rhyolite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 03e545433..793d5aae4 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick", + "count": 4 + } } 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 90210de1a..6f24e18a0 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_furnace", + "count": 1 + } } 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 adb38fc9a..afe5788c9 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 6 + } } 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 4e7e53eb3..556a4e84a 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 4 + } } 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 eed7fd9a7..2619d722c 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 6 + } } 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 1b8a2198a..f0dd40901 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_furnace", + "count": 1 + } } 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 c4b37dbcd..af0bd5263 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_slab", + "count": 6 + } } 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 edd1977b5..ebe4285b1 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_stairs", + "count": 4 + } } 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 332ff85fc..d42973050 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json index fb57d486c..2a5ca9c32 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json deleted file mode 100644 index 8f28f6679..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - "result": "mineralogy:rhyolite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json index ca0267d80..e46251e6d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json deleted file mode 100644 index 9f0e3d818..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - "result": "mineralogy:rhyolite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt.json b/src/main/resources/data/mineralogy/recipes/rock_salt.json index 03e99bf44..a6f18282e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt.json @@ -1,15 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "forge:dusts/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt" - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:dusts/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt", + "count": 1 + } } 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 cc8e6edfc..f335a6177 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..459f75cf0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 b316b31f3..76be26086 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,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_furnace", + "count": 1 + } } 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 eb6e8e620..9948de629 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,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..a02963f20 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..38bd2d579 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "result": { + "item": "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 c319cf971..917d13376 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..7bbcf337c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 33690f29a..e0a9e2c90 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,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..4ff39b8b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 c80d39e2f..9045b42c6 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rock_salt" + }, + { + "tag": "mineralogy:stones/rock_salt" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 0858c92e1..a7c5ecd1f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json @@ -1,12 +1,18 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/rock_salt" - } - ], - "result": { - "item": "mineralogy:rock_salt_dust", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/rock_salt" + } + ], + "result": { + "item": "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 0e4f27294..40948ec71 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json deleted file mode 100644 index 9c16e8851..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..0601b44de --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "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", + "ingredients": [ + { + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..34c6ff413 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..99229693c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "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", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_slab" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..ec751461d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "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", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..209f55a97 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "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", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_wall" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..a9e65443f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..935b6ce63 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_slab" + }, + { + "item": "mineralogy:rock_salt_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..17ba95598 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_slab" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..15536ce7d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3e992cb50 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_stairs" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d8037f405 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..5d419a11f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_wall" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_wall", + "count": 4 + } +} 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 7cc40d4e3..fca0a3020 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 0232ac752..56722fb04 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_blank", + "count": 16 + } } 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 fed65c95a..35e861779 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_cross", + "count": 4 + } } 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 340dd3922..064a7f373 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,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_hammer", + "count": 7 + } } 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 95d14df2a..09b744d43 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 c3e37d540..4bd8daf24 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,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_horizontal", + "count": 3 + } } 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 a88828b19..0c22fafca 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_i", + "count": 7 + } } 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 a4a529c6e..5a507c1a4 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_left", + "count": 3 + } } 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 6bcc90415..2a230ee0f 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 f358afb09..f89898e32 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_plus", + "count": 5 + } } 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 a43c11618..8af06375d 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,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_left" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_left" + }, + { + "item": "mineralogy:rock_salt_relief_left" + } + ], + "result": { + "item": "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 40d5332c9..bed77a197 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,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 2faf6084d..2879cab0e 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_vertical", + "count": 3 + } } 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 a9d10c246..01ee84ab9 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json deleted file mode 100644 index fbd8d0bf2..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - "result": "mineralogy:rock_salt_slab", - "count": 2 - } - } - ] -} 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 170b895db..72c8fe40e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rock_salt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 3ec8d9a7f..c949cf036 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,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick", + "count": 4 + } } 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 46c2a59be..05179faa4 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_furnace", + "count": 1 + } } 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 2db168c61..6545ab1ff 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 6 + } } 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 e49b3a3d5..d9255b432 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 4 + } } 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 e78eb3d50..6af2a8571 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 6 + } } 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 0186ba7d7..0c6979555 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,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_furnace", + "count": 1 + } } 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 47cfe9ef3..e3829748d 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,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_slab", + "count": 6 + } } 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 3c1329524..e6f3e17ef 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,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_stairs", + "count": 4 + } } 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 7d1f4586e..2f39acec3 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,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_wall", + "count": 6 + } } 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 edb542b8e..472e4e654 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json deleted file mode 100644 index a5cbb8fad..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - "result": "mineralogy:rock_salt_stairs", - "count": 1 - } - } - ] -} 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 7b28b4632..7d6bf3b82 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json deleted file mode 100644 index 014b18bc8..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - "result": "mineralogy:rock_salt_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json index 942a0269f..4fd7b2134 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json @@ -1,17 +1,28 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/rock_salt" - }, - { - "item": "minecraft:torch" - }, - { - "item": "minecraft:iron_ingot" - } - ], - "result": { - "item": "mineralogy:rocksaltlamp" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt" + }, + { + "item": "minecraft:torch" + }, + { + "item": "minecraft:iron_ingot" + } + ], + "result": { + "item": "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 bb7090cfc..4ddf6d1eb 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json @@ -1,19 +1,30 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "y", - "y" - ], - "key": { - "x": { - "tag": "forge:lamps/rock_salt" - }, - "y": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "mineralogy:rocksaltstreetlamp" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:lamps/rock_salt" + }, + "y": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "mineralogy:rocksaltstreetlamp", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick.json b/src/main/resources/data/mineralogy/recipes/schist_brick.json index 91b0880cf..076bc08c6 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..14dc140c6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 faed36618..1bb8f2633 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_brick_furnace", + "count": 1 + } } 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 ebb2b1504..c0ed9122f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..8dccd84b8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..af0b93999 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_slab" + }, + { + "item": "mineralogy:schist_brick_slab" + } + ], + "result": { + "item": "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 3aaa6d872..0c87f50f3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..d8ff76992 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 e361ef1d9..88c0b699e 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..7115224fc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 1a5187d2c..8c95ebc3f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/schist" - }, - { - "tag": "mineralogy:crafting_materials/schist" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/schist" + }, + { + "tag": "mineralogy:stones/schist" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 9efb52d40..cdb6e6117 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json deleted file mode 100644 index 672ec8fd9..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..5a08b9d2b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f81102f04 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_smooth_slab" + }, + { + "item": "mineralogy:schist_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e22a7ab92 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_slab" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..3c4dd95a8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..693a03b95 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_wall" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..94be9aea9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3f2bd9e52 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_slab" + }, + { + "item": "mineralogy:schist_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..5bb2a27cb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_slab" + } + }, + "result": { + "item": "mineralogy:schist_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..6ab5a283c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e7f9b5f37 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_stairs" + } + }, + "result": { + "item": "mineralogy:schist_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..f29dc2f62 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..f4e8257a7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_wall" + } + }, + "result": { + "item": "mineralogy:schist_brick_wall", + "count": 4 + } +} 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 5543e323f..8c896c952 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:schist_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 8f000cb0e..a4a1053fb 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + } + }, + "result": { + "item": "mineralogy:schist_relief_blank", + "count": 16 + } } 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 f49efecb0..079c7ea09 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_cross", + "count": 4 + } } 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 937f5156b..6ec33c943 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_hammer", + "count": 7 + } } 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 7498bc8b5..da8d29cf3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:schist_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 fbf881767..dbea4e106 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_horizontal", + "count": 3 + } } 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 64b740a49..c3d7e8a02 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_i", + "count": 7 + } } 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 e2c9905b4..7ebc13697 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_left", + "count": 3 + } } 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 5cc4a40fe..661368f00 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:schist_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 6b5c0a9ec..cd1cfc190 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_plus", + "count": 5 + } } 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 3f74e9f53..baad551c2 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_left" - } - }, - "result": { - "item": "mineralogy:schist_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_left" + }, + { + "item": "mineralogy:schist_relief_left" + } + ], + "result": { + "item": "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 c5b709a26..4e35759bc 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:schist_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 ff58f4d2f..bb754263c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_slab.json b/src/main/resources/data/mineralogy/recipes/schist_slab.json index b2077bf26..4b5c015a3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist" + } + }, + "result": { + "item": "mineralogy:schist_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json b/src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json deleted file mode 100644 index f483d21a2..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/schist" - }, - "result": "mineralogy:schist_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/recipes/schist_smooth.json index dbc4d557d..d08668f7d 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/schist" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/schist" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 443cc804d..df69d15c0 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick", + "count": 4 + } } 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 03b9be473..29b355895 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_furnace", + "count": 1 + } } 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 e710e756c..83066bbd9 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 6 + } } 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 75cdf6e93..6ba265efc 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 4 + } } 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 33d854428..7deee8619 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 6 + } } 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 8af1ec2dd..27692547e 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_smooth_furnace", + "count": 1 + } } 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 92ab5176e..4026ef141 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_slab", + "count": 6 + } } 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 b9d335e00..32e391e4c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_stairs", + "count": 4 + } } 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 c7f007c0d..b1056b4b3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_stairs.json index 91772505d..8db3b75a9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json b/src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json deleted file mode 100644 index b716d2a90..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/schist" - }, - "result": "mineralogy:schist_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/schist_wall.json b/src/main/resources/data/mineralogy/recipes/schist_wall.json index ba114d794..33b2edc02 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json b/src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json deleted file mode 100644 index 6cbad960d..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/schist" - }, - "result": "mineralogy:schist_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_brick.json index ea0d7c357..fafe32fce 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..8c28d0a32 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 cf43d9796..9a304a82b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_brick_furnace", + "count": 1 + } } 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 1b731a8fd..ffe988566 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..ad30cb531 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..92121b06a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_slab" + }, + { + "item": "mineralogy:scoria_brick_slab" + } + ], + "result": { + "item": "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 b7eb4b4d2..4b4271956 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..ddb73200b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 bde1ee20a..e51100c7f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..13bb9cc01 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 e0f386af4..8b7c3cb94 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/scoria" - }, - { - "tag": "mineralogy:crafting_materials/scoria" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/scoria" + }, + { + "tag": "mineralogy:stones/scoria" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 68fe108c1..7a2333246 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json deleted file mode 100644 index b8f1219db..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..9c64fe4d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e53370753 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_smooth_slab" + }, + { + "item": "mineralogy:scoria_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..484191447 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_slab" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..8ea7bcc3c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..363397047 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_wall" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..e16633fa6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1015e31ed --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_slab" + }, + { + "item": "mineralogy:scoria_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..04c3fafaa --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_slab" + } + }, + "result": { + "item": "mineralogy:scoria_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..6e962c799 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..ce6c905cd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_stairs" + } + }, + "result": { + "item": "mineralogy:scoria_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..966bef34e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..bd21fd5df --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_wall" + } + }, + "result": { + "item": "mineralogy:scoria_brick_wall", + "count": 4 + } +} 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 b5f80d77a..631e9770a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 36cea68b3..6494b610d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + } + }, + "result": { + "item": "mineralogy:scoria_relief_blank", + "count": 16 + } } 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 7af7cbb0b..0f42a121b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_cross", + "count": 4 + } } 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 eb954bc9c..c75067366 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_hammer", + "count": 7 + } } 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 db8657667..bad659b95 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 fed37b653..5e262cb10 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_horizontal", + "count": 3 + } } 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 f514d462c..064683ee0 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_i", + "count": 7 + } } 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 66d78c697..727d0c93f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_left", + "count": 3 + } } 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 0a33f245f..fb267789e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 ac91aa42f..b4e57b619 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_plus", + "count": 5 + } } 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 d81d14190..25c1451ef 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_left" - } - }, - "result": { - "item": "mineralogy:scoria_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_left" + }, + { + "item": "mineralogy:scoria_relief_left" + } + ], + "result": { + "item": "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 feb5a4e93..37933c4c1 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:scoria_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 1d67de29a..359b6d57e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_slab.json index 0f32c15bb..a19d3f46d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria" + } + }, + "result": { + "item": "mineralogy:scoria_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json b/src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json deleted file mode 100644 index 3c4b69ed1..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/scoria" - }, - "result": "mineralogy:scoria_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json index 05763e821..6f50c977c 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/scoria" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/scoria" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 bd1329d16..b9e96c342 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick", + "count": 4 + } } 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 eaac47e74..a27a52015 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_furnace", + "count": 1 + } } 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 1accff8ad..45d7b33f6 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 6 + } } 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 0213e8f9c..df9bb8fa0 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 4 + } } 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 e589a6db1..2ed0560fb 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 6 + } } 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 0cf2f2d58..b0d1c5e83 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_furnace", + "count": 1 + } } 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 0d384c6cd..149bcfb87 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_slab", + "count": 6 + } } 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 0113b1066..12e9d6073 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_stairs", + "count": 4 + } } 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 41af35662..e23eb1694 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json index de775db69..f16fc9f96 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json b/src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json deleted file mode 100644 index b619e1d0e..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/scoria" - }, - "result": "mineralogy:scoria_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_wall.json index 79fd7df9c..3a614c933 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json b/src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json deleted file mode 100644 index 0af523267..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/scoria" - }, - "result": "mineralogy:scoria_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick.json b/src/main/resources/data/mineralogy/recipes/shale_brick.json index c7a8a87fc..58dc44b82 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..58e113757 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 783710e82..6d72df0a5 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_brick_furnace", + "count": 1 + } } 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 babe562a8..7c2ee2b09 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..3892cd601 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..9f5af6b4b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_slab" + }, + { + "item": "mineralogy:shale_brick_slab" + } + ], + "result": { + "item": "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 f29fbbc2f..4da8db0e2 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..a05addf52 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 bf744ea77..46c7bab68 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..d5e05e371 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 95b6d6922..1024c53e3 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/shale" - }, - { - "tag": "mineralogy:crafting_materials/shale" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/shale" + }, + { + "tag": "mineralogy:stones/shale" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 3830cbc15..27d358d27 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json deleted file mode 100644 index b929672b2..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..09c9424f3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..15964903a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_smooth_slab" + }, + { + "item": "mineralogy:shale_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..768660cc3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_slab" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..aa64e8d1f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..e9305bff2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_wall" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..1905aa418 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..a387d41b1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_slab" + }, + { + "item": "mineralogy:shale_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..0257961f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_slab" + } + }, + "result": { + "item": "mineralogy:shale_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..93c3d127d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d1c3ecfa2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_stairs" + } + }, + "result": { + "item": "mineralogy:shale_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..ea1bade05 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..2d57f995c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_wall" + } + }, + "result": { + "item": "mineralogy:shale_brick_wall", + "count": 4 + } +} 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 7aea32b74..8d002a9a7 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:shale_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 a2f5d4bb7..7523def56 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + } + }, + "result": { + "item": "mineralogy:shale_relief_blank", + "count": 16 + } } 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 cedeea488..faa94b18a 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_cross", + "count": 4 + } } 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 35e2316a0..cb6ce82f3 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_hammer", + "count": 7 + } } 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 643001f67..99ef074af 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:shale_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 1457d525e..272f6a513 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_horizontal", + "count": 3 + } } 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 90c1c7cf9..b2cca76cc 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_i", + "count": 7 + } } 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 429080474..001fddd8f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_left", + "count": 3 + } } 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 dbb60ab41..20f6812ff 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:shale_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 83b0807b8..c209149d5 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_plus", + "count": 5 + } } 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 f35531bc7..2bc6d860b 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_left" - } - }, - "result": { - "item": "mineralogy:shale_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_left" + }, + { + "item": "mineralogy:shale_relief_left" + } + ], + "result": { + "item": "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 ca41082a9..cbd10d3ab 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:shale_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 64a82697a..03b3ae602 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_slab.json b/src/main/resources/data/mineralogy/recipes/shale_slab.json index f1cafee98..fb9498c0d 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale" + } + }, + "result": { + "item": "mineralogy:shale_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json b/src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json deleted file mode 100644 index 433f5ee08..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/shale" - }, - "result": "mineralogy:shale_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/recipes/shale_smooth.json index 0ae7d7e34..b32e6bfcf 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/shale" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/shale" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 147de5a26..9e3134fa7 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick", + "count": 4 + } } 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 0b89d2fd3..a514a025c 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_furnace", + "count": 1 + } } 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 df112661f..b16a0af6c 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 6 + } } 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 7e64026b8..7ff9045d9 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 4 + } } 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 9d5354dc1..368ca6293 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 6 + } } 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 5cd0c328c..e3859e124 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_smooth_furnace", + "count": 1 + } } 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 d76fe7da0..2e7a6d5ac 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_slab", + "count": 6 + } } 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 6be8af269..f207c7178 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_stairs", + "count": 4 + } } 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 8b4b8117d..bbae30703 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_stairs.json index 35ad4648c..13e60ce75 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json b/src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json deleted file mode 100644 index 1a8d05e3d..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/shale" - }, - "result": "mineralogy:shale_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_wall.json b/src/main/resources/data/mineralogy/recipes/shale_wall.json index 1d8316129..4efa8b7ae 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json b/src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json deleted file mode 100644 index 8c116479a..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/shale" - }, - "result": "mineralogy:shale_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json index efbbbb86a..2177e4bfb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..33c234a39 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 16363394d..b9afddeb7 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_furnace", + "count": 1 + } } 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 61c6f4831..348bb0cdb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..35810ee22 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..bc078ce3a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_slab" + }, + { + "item": "mineralogy:siltstone_brick_slab" + } + ], + "result": { + "item": "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 dd258f885..733e4413e 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..70abb4284 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 fc3c45f2a..b3392bddf 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..100e8efab --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 ff686b00c..755cbe68d 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/siltstone" - }, - { - "tag": "mineralogy:crafting_materials/siltstone" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/siltstone" + }, + { + "tag": "mineralogy:stones/siltstone" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 f455e84f7..8bb2134fa 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json deleted file mode 100644 index 4cb06d4c3..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..9fb44cef9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..35bd0a121 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..aab9e7290 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_slab" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..bca17b4b2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..4eadf7f91 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_wall" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..949d88c54 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1dee7c36f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_slab" + }, + { + "item": "mineralogy:siltstone_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..6fbb68d56 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_slab" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..b241c7820 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..caf08ed1f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_stairs" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..facb892ae --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..641c5c204 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_wall" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_wall", + "count": 4 + } +} 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 4aa9a4a9a..6a6cacde0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 9a730a2bc..831f80c13 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_blank", + "count": 16 + } } 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 721d33b67..f5e7638d0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_cross", + "count": 4 + } } 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 a5e4f383c..475dfc4ed 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_hammer", + "count": 7 + } } 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 a3bf1967e..1dc67bda5 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 cbed00339..8bc6ec55a 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_horizontal", + "count": 3 + } } 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 0e6ea769a..b3cdaa75c 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_i", + "count": 7 + } } 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 00bdca272..b80082cf5 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_left", + "count": 3 + } } 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 3c43f11d9..59e3628ac 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 052763e34..c5137103b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_plus", + "count": 5 + } } 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 70402b7a8..02262dbf9 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_left" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_left" + }, + { + "item": "mineralogy:siltstone_relief_left" + } + ], + "result": { + "item": "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 e4fd4e6a2..0230400fb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 81bbe66d2..e2e0cbafe 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json index 8c09c65af..2f9f880b3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json deleted file mode 100644 index c0d02e510..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/siltstone" - }, - "result": "mineralogy:siltstone_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json index 5721729b2..ac4939f86 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/siltstone" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/siltstone" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 e11ebb0f8..d6a2305d8 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick", + "count": 4 + } } 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 b9d1bddbe..c551960b3 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_furnace", + "count": 1 + } } 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 6716847b8..6bf514c2c 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 6 + } } 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 1e4722c0f..5044825bd 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 4 + } } 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 9dbe513ce..2d24705f3 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 6 + } } 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 be0ed423a..bd6223ad1 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_furnace", + "count": 1 + } } 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 c688ea499..0d0d1f0d8 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_slab", + "count": 6 + } } 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 40f4a2236..d670ea931 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_stairs", + "count": 4 + } } 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 a8721a68b..1b0f052b3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json index af3eac7fc..49d9cc59e 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json deleted file mode 100644 index c15ac518d..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/siltstone" - }, - "result": "mineralogy:siltstone_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json index 010331e66..82486e6e5 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json deleted file mode 100644 index 4925f0442..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/siltstone" - }, - "result": "mineralogy:siltstone_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick.json b/src/main/resources/data/mineralogy/recipes/slate_brick.json index 416c677d7..107b3cc51 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..fd568464f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 b0631ebdb..e59436b9c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_brick_furnace", + "count": 1 + } } 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 1687b11dd..06a75a8b2 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..962601584 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1c493a23c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_slab" + }, + { + "item": "mineralogy:slate_brick_slab" + } + ], + "result": { + "item": "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 52e2d7da2..b6cadbf7c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..e249dbcf8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 9d52f0c53..e9d61e991 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..e0abee16a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 a2383273d..4c3c37e55 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/slate" - }, - { - "tag": "mineralogy:crafting_materials/slate" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/slate" + }, + { + "tag": "mineralogy:stones/slate" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 2df13baf9..85f4a10b1 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json deleted file mode 100644 index 8f64d235a..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..8585d88bf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d8a060f99 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_smooth_slab" + }, + { + "item": "mineralogy:slate_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..6a9fc8cec --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_slab" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..38616b75a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..c297bf090 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_wall" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d6cd49e15 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..e6d1b7449 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_slab" + }, + { + "item": "mineralogy:slate_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..86b407d03 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_slab" + } + }, + "result": { + "item": "mineralogy:slate_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..22a308f99 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..7ce75737c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_stairs" + } + }, + "result": { + "item": "mineralogy:slate_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..1f2cd918d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..d2604aed7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_wall" + } + }, + "result": { + "item": "mineralogy:slate_brick_wall", + "count": 4 + } +} 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 8af9e438b..3e92d3f5c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:slate_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 5a084af85..101f1e0fd 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + } + }, + "result": { + "item": "mineralogy:slate_relief_blank", + "count": 16 + } } 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 b2e366b75..2deb2b2f6 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_cross", + "count": 4 + } } 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 e2d0e2495..b53912ef3 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_hammer", + "count": 7 + } } 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 6d210cb80..7044d39fe 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:slate_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 27acd815b..128021985 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_horizontal", + "count": 3 + } } 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 c4c002f6b..515e88343 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_i", + "count": 7 + } } 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 d4337f502..612917737 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_left", + "count": 3 + } } 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 64a736b38..34d48ed1f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:slate_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 19c31b7e1..667c3d12b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_plus", + "count": 5 + } } 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 14d1b6924..84328d06b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_left" - } - }, - "result": { - "item": "mineralogy:slate_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_left" + }, + { + "item": "mineralogy:slate_relief_left" + } + ], + "result": { + "item": "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 911ac0521..74360b013 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:slate_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 daebb82b5..52b37d4ae 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_slab.json b/src/main/resources/data/mineralogy/recipes/slate_slab.json index 86e818a43..4c67b5175 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate" + } + }, + "result": { + "item": "mineralogy:slate_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json deleted file mode 100644 index 9a4392327..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/slate" - }, - "result": "mineralogy:slate_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/recipes/slate_smooth.json index 0ff49ff10..6397edce8 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/slate" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/slate" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 d7990c7f9..94f86fa63 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick", + "count": 4 + } } 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 28d25c17e..64ddfbf2b 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_furnace", + "count": 1 + } } 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 14c2a63e7..b47121a97 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 6 + } } 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 97d7bf70f..d4c102e0a 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 4 + } } 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 1ab824e3b..c99d9b74b 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 6 + } } 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 45f79ecf1..151cff07d 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_smooth_furnace", + "count": 1 + } } 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 5a3fc4158..8f29375ac 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_slab", + "count": 6 + } } 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 3d91f8f91..d5114b634 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_stairs", + "count": 4 + } } 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 5e14f0096..a5858d0b2 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_stairs.json index e3a74156d..1460c18ae 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json deleted file mode 100644 index 6648c9f42..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/slate" - }, - "result": "mineralogy:slate_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_wall.json b/src/main/resources/data/mineralogy/recipes/slate_wall.json index 2263f87d3..82c1ed805 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json deleted file mode 100644 index e1d6665f8..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/slate" - }, - "result": "mineralogy:slate_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/recipes/sulfur_block.json index 14c16e14f..9b09930ab 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_block.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_block.json @@ -1,16 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/sulfur" - } - }, - "result": { - "item": "mineralogy:sulfur_block" - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:sulfur_dust" + } + }, + "result": { + "item": "mineralogy:sulfur_block", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json index f4ff1920d..f2ee994e1 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json @@ -1,12 +1,22 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/sulfur" - } - ], - "result": { - "item": "mineralogy:sulfur_dust", - "count": 9 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/sulfur" + } + ], + "result": { + "item": "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 6d6a29a22..a36104fc8 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_brick", + "count": 4 + } } 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 new file mode 100644 index 000000000..7e132185e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 ec325d196..00005e56e 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_brick_furnace", + "count": 1 + } } 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 fc9ef82c8..1ca9ff9d2 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_slab", + "count": 6 + } } 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 new file mode 100644 index 000000000..0dac00b8f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..cd29d3afa --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_slab" + }, + { + "item": "mineralogy:tuff_brick_slab" + } + ], + "result": { + "item": "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 fb7f95007..f15d9f1d6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_stairs", + "count": 4 + } } 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 new file mode 100644 index 000000000..93d399e69 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 b76541236..e883d8946 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_wall", + "count": 6 + } } 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 new file mode 100644 index 000000000..3d037a981 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 ba5cf7cea..8993da264 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/tuff" - }, - { - "tag": "mineralogy:crafting_materials/tuff" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/tuff" + }, + { + "tag": "mineralogy:stones/tuff" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "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 9ace31dd6..bfaf4e7fc 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json deleted file mode 100644 index 1560e574b..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_furnace" - } - } - } - ] -} 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 new file mode 100644 index 000000000..3e9fc577c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..fcf12b80d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_smooth_slab" + }, + { + "item": "mineralogy:tuff_smooth_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..a9c792e7b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_slab" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..952278dd1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..2fbf24839 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_wall" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 4 + } +} 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 new file mode 100644 index 000000000..d2035ce44 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..1c5ab931a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_slab" + }, + { + "item": "mineralogy:tuff_slab" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..59a9abaad --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_slab" + } + }, + "result": { + "item": "mineralogy:tuff_brick_slab", + "count": 4 + } +} 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 new file mode 100644 index 000000000..688e71c23 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..3ed0b1f72 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_stairs" + } + }, + "result": { + "item": "mineralogy:tuff_brick_stairs", + "count": 4 + } +} 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 new file mode 100644 index 000000000..48560826a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "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 new file mode 100644 index 000000000..56c5366e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_wall" + } + }, + "result": { + "item": "mineralogy:tuff_brick_wall", + "count": 4 + } +} 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 71e58f0d5..5203be981 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_axe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "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 606ff3cfd..86b20cde4 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_relief_blank", - "count": 16 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_relief_blank", + "count": 16 + } } 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 25c409ee9..80cf00560 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_cross", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_cross", + "count": 4 + } } 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 f1011b59a..2edc79865 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_hammer", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_hammer", + "count": 7 + } } 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 3ee6d98f1..4a5f4de50 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_hoe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "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 4f38b2a58..f8cc12efa 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_horizontal", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_horizontal", + "count": 3 + } } 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 0aa99ab3b..7284cd87c 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_i", - "count": 7 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_i", + "count": 7 + } } 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 2416c5308..3bfbd2577 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_left", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_left", + "count": 3 + } } 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 7136ec700..f9463a3be 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_pickaxe", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "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 a266826d0..b34adfea7 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_plus", - "count": 5 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_plus", + "count": 5 + } } 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 3835a78cc..94a1db532 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_left" - } - }, - "result": { - "item": "mineralogy:tuff_relief_right", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_left" + }, + { + "item": "mineralogy:tuff_relief_left" + } + ], + "result": { + "item": "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 102151cb0..ce0d41ccd 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:tuff_relief_sword", - "count": 8 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "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 0d2964b2c..f05955700 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_vertical", - "count": 3 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_slab.json index 3708090ad..52c31a4d2 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json b/src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json deleted file mode 100644 index 0638972d0..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/tuff" - }, - "result": "mineralogy:tuff_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json index 729a3d7ff..edcbcaa94 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/tuff" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/tuff" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "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 54a6fd591..142081412 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick", + "count": 4 + } } 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 b2d8d8f3a..1bceadfca 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,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_furnace", + "count": 1 + } } 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 42c396119..8b7e764c6 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,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 6 + } } 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 975a84d6b..ae82e931b 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,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 4 + } } 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 eed6d2229..d93560a08 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,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 6 + } } 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 95afeda17..9a2877f87 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_furnace" - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_furnace", + "count": 1 + } } 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 6d1b1783d..3d4f5fa18 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_slab", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_slab", + "count": 6 + } } 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 e7e859359..7ef525853 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_stairs", + "count": 4 + } } 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 f5a8095b8..aac22c40a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json index d3422cfe3..f207336f7 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_stairs", - "count": 4 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json b/src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json deleted file mode 100644 index 1ba4f52b0..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/tuff" - }, - "result": "mineralogy:tuff_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_wall.json index 26f78a679..c02fb2a46 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_wall", - "count": 6 - } - } - } - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json b/src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json deleted file mode 100644 index a1b0305f9..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/tuff" - }, - "result": "mineralogy:tuff_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/tags/blocks/rocks.json b/src/main/resources/data/mineralogy/tags/blocks/rocks.json index 78f81c8a0..eccd4a778 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/rocks.json +++ b/src/main/resources/data/mineralogy/tags/blocks/rocks.json @@ -13,7 +13,6 @@ "mineralogy:basaltic_glass", "mineralogy:scoria", "mineralogy:tuff", - "mineralogy:pumice", "mineralogy:shale", "mineralogy:conglomerate", "mineralogy:dolomite", diff --git a/src/main/resources/data/mineralogy/tags/blocks/standard_rocks.json b/src/main/resources/data/mineralogy/tags/blocks/standard_rocks.json index c39264a40..45b8ff0db 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/standard_rocks.json +++ b/src/main/resources/data/mineralogy/tags/blocks/standard_rocks.json @@ -13,7 +13,6 @@ "mineralogy:basaltic_glass", "mineralogy:scoria", "mineralogy:tuff", - "mineralogy:pumice", "mineralogy:shale", "mineralogy:conglomerate", "mineralogy:dolomite", diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json new file mode 100644 index 000000000..5cdea399b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json new file mode 100644 index 000000000..708588bcd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite", + "minecraft:andesite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json b/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json new file mode 100644 index 000000000..1ae916657 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt", + "minecraft:basalt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json new file mode 100644 index 000000000..9cb3a5c60 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json b/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json new file mode 100644 index 000000000..9a8db044e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json b/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json new file mode 100644 index 000000000..b1d74d01e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json new file mode 100644 index 000000000..a6c473010 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite", + "minecraft:diorite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json new file mode 100644 index 000000000..f329a9162 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json b/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json new file mode 100644 index 000000000..2b664843f --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json b/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json new file mode 100644 index 000000000..a19fbac88 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json new file mode 100644 index 000000000..ae5dd9590 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite", + "minecraft:granite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json b/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json new file mode 100644 index 000000000..7ec83bdd3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json b/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json new file mode 100644 index 000000000..3f32e2ff2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json b/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json new file mode 100644 index 000000000..bdb724467 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json new file mode 100644 index 000000000..74fb17da3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json new file mode 100644 index 000000000..7675fc010 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json new file mode 100644 index 000000000..34de42c18 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json new file mode 100644 index 000000000..991dc28d5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json new file mode 100644 index 000000000..f539e57f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json new file mode 100644 index 000000000..460e41c8e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json b/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json new file mode 100644 index 000000000..24df4c009 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json b/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json new file mode 100644 index 000000000..ba6cdfc2c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json b/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json new file mode 100644 index 000000000..51d04b13d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json b/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json new file mode 100644 index 000000000..e95cbccee --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json b/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json new file mode 100644 index 000000000..105f43a4d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json b/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json new file mode 100644 index 000000000..75a410d88 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json b/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json new file mode 100644 index 000000000..922156e16 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff", + "minecraft:tuff" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json b/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json new file mode 100644 index 000000000..dda5bb541 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + "#forge:cobblestone", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/drywall/white.json b/src/main/resources/data/mineralogy/tags/items/drywall/white.json new file mode 100644 index 000000000..3fcdb5b08 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/drywall/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:drywall_white" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/rocks.json b/src/main/resources/data/mineralogy/tags/items/rocks.json index 78f81c8a0..eccd4a778 100644 --- a/src/main/resources/data/mineralogy/tags/items/rocks.json +++ b/src/main/resources/data/mineralogy/tags/items/rocks.json @@ -13,7 +13,6 @@ "mineralogy:basaltic_glass", "mineralogy:scoria", "mineralogy:tuff", - "mineralogy:pumice", "mineralogy:shale", "mineralogy:conglomerate", "mineralogy:dolomite", diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json new file mode 100644 index 000000000..cc4117a83 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json new file mode 100644 index 000000000..9db82ccae --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json new file mode 100644 index 000000000..5670a0a5f --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json new file mode 100644 index 000000000..fbbd50b2c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json new file mode 100644 index 000000000..2d0d6184e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_slab", + "minecraft:andesite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json new file mode 100644 index 000000000..66931ac90 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json new file mode 100644 index 000000000..6fe008cd9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth_slab", + "minecraft:polished_andesite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json new file mode 100644 index 000000000..397fdafd5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json new file mode 100644 index 000000000..c86626703 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json new file mode 100644 index 000000000..b7c770d7c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json new file mode 100644 index 000000000..a61e9fd5d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json new file mode 100644 index 000000000..d90666abc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json new file mode 100644 index 000000000..717c00479 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json new file mode 100644 index 000000000..5a3e112e8 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json new file mode 100644 index 000000000..1a0e8a748 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json new file mode 100644 index 000000000..3ce475146 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json new file mode 100644 index 000000000..d97b6a843 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json new file mode 100644 index 000000000..2970425bc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json new file mode 100644 index 000000000..d04c77375 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json new file mode 100644 index 000000000..d28a89f07 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json new file mode 100644 index 000000000..665ed6689 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json new file mode 100644 index 000000000..1a8dc00dc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json new file mode 100644 index 000000000..a511e4684 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json new file mode 100644 index 000000000..8e2151cfc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json new file mode 100644 index 000000000..67b558bee --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_slab", + "minecraft:diorite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json new file mode 100644 index 000000000..6bf529738 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json new file mode 100644 index 000000000..20eef8ccb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth_slab", + "minecraft:polished_diorite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json new file mode 100644 index 000000000..7a98dd262 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json new file mode 100644 index 000000000..4d290eed2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json new file mode 100644 index 000000000..97227b908 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json new file mode 100644 index 000000000..1dc98f76e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json new file mode 100644 index 000000000..8dd4268b0 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json new file mode 100644 index 000000000..e3576cff4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json new file mode 100644 index 000000000..643872776 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json new file mode 100644 index 000000000..20e323ef8 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json new file mode 100644 index 000000000..4e328768c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json new file mode 100644 index 000000000..68512d817 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json new file mode 100644 index 000000000..e962d4e9c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json new file mode 100644 index 000000000..7aa2f746d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json new file mode 100644 index 000000000..c6a513819 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json new file mode 100644 index 000000000..892116b2c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_slab", + "minecraft:granite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json new file mode 100644 index 000000000..c7c412ec2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json new file mode 100644 index 000000000..730511a99 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth_slab", + "minecraft:polished_granite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json new file mode 100644 index 000000000..e56697231 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json new file mode 100644 index 000000000..408d05b3c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json new file mode 100644 index 000000000..4297940a7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json new file mode 100644 index 000000000..97f5d04e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json new file mode 100644 index 000000000..b1ce7f4db --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json new file mode 100644 index 000000000..e5f7333c1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json new file mode 100644 index 000000000..ef5bdae0d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json new file mode 100644 index 000000000..f5701a999 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json new file mode 100644 index 000000000..113f36066 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble.json new file mode 100644 index 000000000..ebda57b3d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json new file mode 100644 index 000000000..3b9fba246 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json new file mode 100644 index 000000000..876baf7d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json new file mode 100644 index 000000000..cc716132c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json new file mode 100644 index 000000000..2d75804c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json new file mode 100644 index 000000000..1fa49bab1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json new file mode 100644 index 000000000..842a79951 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json new file mode 100644 index 000000000..975702399 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json new file mode 100644 index 000000000..85d7de59c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json new file mode 100644 index 000000000..a9e624210 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json new file mode 100644 index 000000000..66f6500ec --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json new file mode 100644 index 000000000..8ccfcb2a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json new file mode 100644 index 000000000..15551daab --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json new file mode 100644 index 000000000..e31a75bdf --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json new file mode 100644 index 000000000..18572c5d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json new file mode 100644 index 000000000..651d50fe3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json new file mode 100644 index 000000000..f727b589a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json new file mode 100644 index 000000000..d470beba6 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json new file mode 100644 index 000000000..a43bb7783 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json new file mode 100644 index 000000000..bf5f49a29 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json new file mode 100644 index 000000000..3595ab596 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json new file mode 100644 index 000000000..f58f9f563 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json new file mode 100644 index 000000000..1dd4e97fe --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json new file mode 100644 index 000000000..9a998c5dc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json new file mode 100644 index 000000000..c185ea5e4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json new file mode 100644 index 000000000..dd1efa5d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json new file mode 100644 index 000000000..d41b64b15 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json new file mode 100644 index 000000000..a4932de04 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json new file mode 100644 index 000000000..e76862b94 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json new file mode 100644 index 000000000..cd5329250 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json new file mode 100644 index 000000000..85a609347 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json new file mode 100644 index 000000000..9864136eb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist.json new file mode 100644 index 000000000..a1ce71a3a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json new file mode 100644 index 000000000..e1306e381 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json new file mode 100644 index 000000000..93401df40 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json new file mode 100644 index 000000000..c0658afea --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json new file mode 100644 index 000000000..b58eade46 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json new file mode 100644 index 000000000..9ca979dc7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json new file mode 100644 index 000000000..fbcce69b9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json new file mode 100644 index 000000000..a53e4803e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale.json new file mode 100644 index 000000000..b55c232a4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json new file mode 100644 index 000000000..1981c8a99 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json new file mode 100644 index 000000000..662067502 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json new file mode 100644 index 000000000..77666c63d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json new file mode 100644 index 000000000..dc95b1428 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json new file mode 100644 index 000000000..d461205e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json new file mode 100644 index 000000000..0aeafc131 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json new file mode 100644 index 000000000..c90b6e834 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate.json new file mode 100644 index 000000000..6c4f3d89b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json new file mode 100644 index 000000000..4aabe2c82 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json new file mode 100644 index 000000000..4e198eb90 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json new file mode 100644 index 000000000..77e8f5b2c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json new file mode 100644 index 000000000..55fbe278b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json new file mode 100644 index 000000000..079ddf207 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json new file mode 100644 index 000000000..5be1ce879 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json new file mode 100644 index 000000000..6c6dd368b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/standard_rocks.json b/src/main/resources/data/mineralogy/tags/items/standard_rocks.json index c39264a40..45b8ff0db 100644 --- a/src/main/resources/data/mineralogy/tags/items/standard_rocks.json +++ b/src/main/resources/data/mineralogy/tags/items/standard_rocks.json @@ -13,7 +13,6 @@ "mineralogy:basaltic_glass", "mineralogy:scoria", "mineralogy:tuff", - "mineralogy:pumice", "mineralogy:shale", "mineralogy:conglomerate", "mineralogy:dolomite", diff --git a/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json b/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json new file mode 100644 index 000000000..5643de212 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + "#minecraft:stone_crafting_materials", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json b/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json new file mode 100644 index 000000000..d2bd2ba86 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + "#minecraft:stone_tool_materials", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json new file mode 100644 index 000000000..5cdea399b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json new file mode 100644 index 000000000..1651716ad --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json new file mode 100644 index 000000000..a891ba7f8 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json new file mode 100644 index 000000000..48eb807c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json new file mode 100644 index 000000000..708588bcd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite", + "minecraft:andesite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json new file mode 100644 index 000000000..65dd79abf --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json new file mode 100644 index 000000000..a69cca9fa --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth", + "minecraft:polished_andesite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json new file mode 100644 index 000000000..77fa030cc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json new file mode 100644 index 000000000..1ae916657 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt", + "minecraft:basalt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json new file mode 100644 index 000000000..49e671bdb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json new file mode 100644 index 000000000..4a744d51b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth", + "minecraft:polished_basalt", + "minecraft:smooth_basalt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json new file mode 100644 index 000000000..3118bb8c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json new file mode 100644 index 000000000..9cb3a5c60 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json new file mode 100644 index 000000000..ca6b5c874 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json new file mode 100644 index 000000000..c26bf62e0 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json new file mode 100644 index 000000000..687a62cb9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json new file mode 100644 index 000000000..9a8db044e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json new file mode 100644 index 000000000..dbb375208 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json new file mode 100644 index 000000000..e9b9b7d51 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json new file mode 100644 index 000000000..0c58445bb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase.json new file mode 100644 index 000000000..b1d74d01e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json new file mode 100644 index 000000000..dfd293283 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json new file mode 100644 index 000000000..3931e59c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json new file mode 100644 index 000000000..c4039acd1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json new file mode 100644 index 000000000..a6c473010 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite", + "minecraft:diorite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json new file mode 100644 index 000000000..44f75de23 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json new file mode 100644 index 000000000..28fc952bd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth", + "minecraft:polished_diorite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json new file mode 100644 index 000000000..9d2661c01 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json new file mode 100644 index 000000000..f329a9162 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json new file mode 100644 index 000000000..c010f8c2e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json new file mode 100644 index 000000000..d1e984d14 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json new file mode 100644 index 000000000..2f74306bc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json new file mode 100644 index 000000000..2b664843f --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json new file mode 100644 index 000000000..1a4f230f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json new file mode 100644 index 000000000..ce9b70813 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json new file mode 100644 index 000000000..53dea2b13 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json new file mode 100644 index 000000000..a19fbac88 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json new file mode 100644 index 000000000..6a784a9fb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json new file mode 100644 index 000000000..211fd8983 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json new file mode 100644 index 000000000..5ab5d0aaa --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite.json b/src/main/resources/data/mineralogy/tags/items/stones/granite.json new file mode 100644 index 000000000..ae5dd9590 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite", + "minecraft:granite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json new file mode 100644 index 000000000..b4f65a8a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json new file mode 100644 index 000000000..947518d8b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth", + "minecraft:polished_granite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json new file mode 100644 index 000000000..a68aa55e3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json new file mode 100644 index 000000000..7ec83bdd3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json new file mode 100644 index 000000000..fa6cbf595 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json new file mode 100644 index 000000000..9f6801294 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json new file mode 100644 index 000000000..9da4b03c2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone.json new file mode 100644 index 000000000..3f32e2ff2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json new file mode 100644 index 000000000..f49563caf --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json new file mode 100644 index 000000000..d45ba82ba --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json new file mode 100644 index 000000000..4e7f4269e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble.json b/src/main/resources/data/mineralogy/tags/items/stones/marble.json new file mode 100644 index 000000000..bdb724467 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json new file mode 100644 index 000000000..7359596ec --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json new file mode 100644 index 000000000..4ec76fe47 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json new file mode 100644 index 000000000..ed9758ea4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json new file mode 100644 index 000000000..74fb17da3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json new file mode 100644 index 000000000..5572d90dd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json new file mode 100644 index 000000000..99993cecc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json new file mode 100644 index 000000000..b393df328 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json new file mode 100644 index 000000000..7675fc010 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json new file mode 100644 index 000000000..79089e743 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json new file mode 100644 index 000000000..f0cd06b16 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json new file mode 100644 index 000000000..c947fbd24 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json new file mode 100644 index 000000000..34de42c18 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json new file mode 100644 index 000000000..d5164e79e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json new file mode 100644 index 000000000..05cc3984e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json new file mode 100644 index 000000000..f4aea4223 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json new file mode 100644 index 000000000..991dc28d5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json new file mode 100644 index 000000000..9e33f47aa --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json new file mode 100644 index 000000000..6c74aea08 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json new file mode 100644 index 000000000..d381910bc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json new file mode 100644 index 000000000..f539e57f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json new file mode 100644 index 000000000..ae21a9047 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json new file mode 100644 index 000000000..f29a3ef24 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json new file mode 100644 index 000000000..73b47a97a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json new file mode 100644 index 000000000..460e41c8e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json new file mode 100644 index 000000000..324c3af21 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json new file mode 100644 index 000000000..37b2943cc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json new file mode 100644 index 000000000..3fb64d82b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json new file mode 100644 index 000000000..24df4c009 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json new file mode 100644 index 000000000..a66102e22 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json new file mode 100644 index 000000000..cb1591d29 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json new file mode 100644 index 000000000..b63b027b0 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist.json b/src/main/resources/data/mineralogy/tags/items/stones/schist.json new file mode 100644 index 000000000..ba6cdfc2c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json new file mode 100644 index 000000000..9e7adbfbf --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json new file mode 100644 index 000000000..35372ad18 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json new file mode 100644 index 000000000..b1eaa31df --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria.json new file mode 100644 index 000000000..51d04b13d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json new file mode 100644 index 000000000..d752ece67 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json new file mode 100644 index 000000000..72faf39b1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json new file mode 100644 index 000000000..3d375e806 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale.json b/src/main/resources/data/mineralogy/tags/items/stones/shale.json new file mode 100644 index 000000000..e95cbccee --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json new file mode 100644 index 000000000..645bac6d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json new file mode 100644 index 000000000..c0ac17bed --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json new file mode 100644 index 000000000..f87e41f64 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json new file mode 100644 index 000000000..105f43a4d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json new file mode 100644 index 000000000..e156e2851 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json new file mode 100644 index 000000000..40a652aba --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json new file mode 100644 index 000000000..3ace16070 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate.json b/src/main/resources/data/mineralogy/tags/items/stones/slate.json new file mode 100644 index 000000000..75a410d88 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json new file mode 100644 index 000000000..8d291b1f2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json new file mode 100644 index 000000000..ead7f959d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json new file mode 100644 index 000000000..50301895c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff.json new file mode 100644 index 000000000..922156e16 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff", + "minecraft:tuff" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json new file mode 100644 index 000000000..1c1e95f53 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json new file mode 100644 index 000000000..09c8e7619 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json new file mode 100644 index 000000000..db7ed6370 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json b/src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json deleted file mode 100644 index d09a4b438..000000000 --- a/src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cobblestone", - "minecraft:blackstone", - "minecraft:cobbled_deepslate" - ] -} diff --git a/src/main/resources/data/poweradvantage/tags/blocks/crusher_inputs/rocks.json b/src/main/resources/data/poweradvantage/tags/blocks/crusher_inputs/rocks.json index c39264a40..45b8ff0db 100644 --- a/src/main/resources/data/poweradvantage/tags/blocks/crusher_inputs/rocks.json +++ b/src/main/resources/data/poweradvantage/tags/blocks/crusher_inputs/rocks.json @@ -13,7 +13,6 @@ "mineralogy:basaltic_glass", "mineralogy:scoria", "mineralogy:tuff", - "mineralogy:pumice", "mineralogy:shale", "mineralogy:conglomerate", "mineralogy:dolomite", diff --git a/src/main/resources/data/poweradvantage/tags/items/crusher_inputs/rocks.json b/src/main/resources/data/poweradvantage/tags/items/crusher_inputs/rocks.json index c39264a40..45b8ff0db 100644 --- a/src/main/resources/data/poweradvantage/tags/items/crusher_inputs/rocks.json +++ b/src/main/resources/data/poweradvantage/tags/items/crusher_inputs/rocks.json @@ -13,7 +13,6 @@ "mineralogy:basaltic_glass", "mineralogy:scoria", "mineralogy:tuff", - "mineralogy:pumice", "mineralogy:shale", "mineralogy:conglomerate", "mineralogy:dolomite", diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index d0a24c892..12afa0fdf 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,7 @@ { "pack": { - "description": "mineralogy resources", + "description": "Minecraft Mineralogy", "pack_format": 9, - "forge:resource_pack_format": 8, - "forge:data_pack_format": 9 + "_comment": "A pack_format of 9 is required for Minecraft 1.18.2 resource packs." } } diff --git a/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java b/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java new file mode 100644 index 000000000..77c689660 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java @@ -0,0 +1,367 @@ +package zone.moddev.mc.mineralogy; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.Test; +import zone.moddev.mc.mineralogy.documentation.DocumentationExporter; +import zone.moddev.mc.mineralogy.migration.LegacyMineralogy6ConfigMigrator; +import zone.moddev.mc.mineralogy.migration.LegacyOreConfigMigrator; + +import java.io.File; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.stream.Stream; + +import static org.junit.Assert.*; + +public class ConfigurationAndMigrationTest { + @Test + public void cleanConfigContainsOnlyContentOptionsAndSafeDefaults() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-clean-config"); + MineralogyConfig.load(directory); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + String text = new String(Files.readAllBytes(config), StandardCharsets.UTF_8); + assertTrue(text.contains("[options]")); + assertTrue(text.contains("COBBLESTONE_EQUIVILENT = true")); + assertTrue(text.contains("GROUP_TABS_BY_TYPE = false")); + assertTrue(text.contains("ENABLE_DRYWALLS = true")); + assertFalse(text.contains("world-gen")); + assertFalse(text.contains("PLACE_MINERALOGY_ROCK")); + assertTrue(MineralogyConfig.makeRockCobblestoneEquivilent()); + assertFalse(MineralogyConfig.groupCreativeTabItemsByType()); + assertTrue(MineralogyConfig.contentPolicy().drywallsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().rockSaltLampsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralDustsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralFertilizerEnabled()); + } + + @Test + public void existingConfigIsReadWithoutBeingRewritten() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-existing-config"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] original = ("# retained legacy file\r\n[options]\r\n" + + "COBBLESTONE_EQUIVILENT = false\r\nGROUP_TABS_BY_TYPE = true\r\n" + + "ENABLE_DRYWALLS = false\r\nENABLE_ROCK_SALT_LAMPS = false\r\n" + + "ENABLE_MINERAL_DUSTS = false\r\nENABLE_MINERAL_FERTILIZER = false\r\n" + + "[world-gen]\r\nGEOLOGY_MODE = \"GEOME\"\r\n").getBytes(StandardCharsets.UTF_8); + Files.write(config, original); + MineralogyConfig.load(directory); + assertArrayEquals(original, Files.readAllBytes(config)); + assertFalse(MineralogyConfig.makeRockCobblestoneEquivilent()); + assertTrue(MineralogyConfig.groupCreativeTabItemsByType()); + assertFalse(MineralogyConfig.contentPolicy().drywallsEnabled()); + assertFalse(MineralogyConfig.contentPolicy().rockSaltLampsEnabled()); + assertFalse(MineralogyConfig.contentPolicy().mineralDustsEnabled()); + assertFalse(MineralogyConfig.contentPolicy().mineralFertilizerEnabled()); + assertFalse(MineralogyConfig.isCreativeVisible("drywall_black")); + assertFalse(MineralogyConfig.isCreativeVisible("sulfur_dust")); + assertFalse(MineralogyConfig.isCreativeVisible("mineral_fertilizer")); + } + + @Test + public void missingMineralogySixKeysUseEnabledDefaultsWithoutRewriting() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-old-content-config"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] original = ("[options]\nDROP_COBBLESTONE = true # retained comment\n") + .getBytes(StandardCharsets.UTF_8); + Files.write(config, original); + MineralogyConfig.load(directory); + assertArrayEquals(original, Files.readAllBytes(config)); + assertTrue(MineralogyConfig.dropCobblestone()); + assertTrue(MineralogyConfig.contentPolicy().drywallsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().rockSaltLampsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralDustsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralFertilizerEnabled()); + assertFalse(MineralogyConfig.groupCreativeTabItemsByType()); + } + + @Test + public void issue121SwitchesRemainIndependent() throws Exception { + String[] keys = { ContentPolicy.ENABLE_DRYWALLS, ContentPolicy.ENABLE_ROCK_SALT_LAMPS, + ContentPolicy.ENABLE_MINERAL_DUSTS, ContentPolicy.ENABLE_MINERAL_FERTILIZER }; + String[] hidden = { "drywall_black", "rocksaltlamp", "sulfur_dust", "mineral_fertilizer" }; + for (int selected = 0; selected < keys.length; selected++) { + Path directory = Files.createTempDirectory("mineralogy-policy-" + selected); + StringBuilder config = new StringBuilder("[options]\n"); + for (int index = 0; index < keys.length; index++) { + config.append(keys[index]).append(" = ").append(index != selected).append('\n'); + } + Files.write(directory.resolve(MineralogyConfig.FILE_NAME), + config.toString().getBytes(StandardCharsets.UTF_8)); + MineralogyConfig.load(directory); + for (int index = 0; index < hidden.length; index++) { + assertEquals(keys[selected] + " must be independent for " + hidden[index], + index != selected, MineralogyConfig.isCreativeVisible(hidden[index])); + } + } + } + + @Test + public void independentOreMigrationConvertsExclusiveMaximumAndIsIdempotent() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-ore-migration"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] source = ("[ores.sulfur_ore]\nminY = 7\nmaxY = 50\nfrequency = 2.5\nquantity = 9\n" + + "[ores.phosphorous_ore]\nminY = 16\nmaxY = 64\nfrequency = 1.0\nquantity = 16\n" + + "[ores.nitrate_ore]\nminY = 5\nmaxY = 40\nfrequency = nope\nquantity = 12\n") + .getBytes(StandardCharsets.UTF_8); + Files.write(config, source); + LegacyOreConfigMigrator.migrate(config, null); + Path override = directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE); + Path report = directory.resolve(LegacyOreConfigMigrator.REPORT_FILE); + assertTrue(Files.isRegularFile(override)); + assertTrue(Files.isRegularFile(report)); + JsonObject root = parse(override.toFile()); + JsonObject sulfur = root.getAsJsonObject("ores") + .getAsJsonObject("mineralogy:ore/mineralogy/sulfur_ore") + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + assertEquals(7, sulfur.get("min_y").getAsInt()); + assertEquals(49, sulfur.get("max_y").getAsInt()); + assertEquals(2.5D, sulfur.get("frequency").getAsDouble(), 0.0D); + assertEquals(9, sulfur.get("quantity").getAsInt()); + String reportText = new String(Files.readAllBytes(report), StandardCharsets.UTF_8); + assertTrue(reportText.contains("phosphorous_ore.result=default")); + assertTrue(reportText.contains("nitrate_ore.result=default-invalid")); + assertArrayEquals(source, Files.readAllBytes(config)); + + byte[] firstOverride = Files.readAllBytes(override); + byte[] firstReport = Files.readAllBytes(report); + LegacyOreConfigMigrator.migrate(config, null); + assertArrayEquals(firstOverride, Files.readAllBytes(override)); + assertArrayEquals(firstReport, Files.readAllBytes(report)); + } + + @Test + public void establishedOverridesRemainAuthoritative() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-established-override"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + Files.write(config, ("[ores.sulphur_ore]\nminY=1\nmaxY=20\nfrequency=3\nquantity=4\n") + .getBytes(StandardCharsets.UTF_8)); + Path override = directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE); + byte[] established = "{\"established\":true}\n".getBytes(StandardCharsets.UTF_8); + Files.write(override, established); + LegacyOreConfigMigrator.migrate(config, null); + assertArrayEquals(established, Files.readAllBytes(override)); + String report = new String(Files.readAllBytes(directory.resolve( + LegacyOreConfigMigrator.REPORT_FILE)), StandardCharsets.UTF_8); + assertTrue(report.contains("existing Mineralogy provider override is authoritative")); + } + + @Test + public void establishedOreSpawnGlobalConfigurationPreventsMigration() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-established-global"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + Files.write(config, ("[ores.sulfur_ore]\nminY=1\nmaxY=20\nfrequency=3\nquantity=4\n") + .getBytes(StandardCharsets.UTF_8)); + byte[] global = "{\"schema_version\":6}\n".getBytes(StandardCharsets.UTF_8); + Files.write(directory.resolve(LegacyOreConfigMigrator.GLOBAL_FILE), global); + LegacyOreConfigMigrator.migrate(config, null); + assertFalse(Files.exists(directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE))); + assertArrayEquals(global, Files.readAllBytes(directory.resolve(LegacyOreConfigMigrator.GLOBAL_FILE))); + assertTrue(new String(Files.readAllBytes(directory.resolve(LegacyOreConfigMigrator.REPORT_FILE)), + StandardCharsets.UTF_8).contains("existing OreSpawn global configuration is authoritative")); + } + + @Test + public void nativeSulfurCategoryWinsHistoricalFallbackAndMaximum256Becomes255() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-duplicate-sulfur"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + Files.write(config, ("[ores.sulphur_ore]\nminY=2\nmaxY=30\nfrequency=2\nquantity=3\n" + + "[ores.sulfur_ore]\nminY=8\nmaxY=256\nfrequency=0\nquantity=7\n") + .getBytes(StandardCharsets.UTF_8)); + LegacyOreConfigMigrator.migrate(config, null); + JsonObject sulfur = parse(directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE).toFile()) + .getAsJsonObject("ores").getAsJsonObject("mineralogy:ore/mineralogy/sulfur_ore") + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + assertEquals(8, sulfur.get("min_y").getAsInt()); + assertEquals(255, sulfur.get("max_y").getAsInt()); + assertEquals(0.0D, sulfur.get("frequency").getAsDouble(), 0.0D); + assertEquals(7, sulfur.get("quantity").getAsInt()); + } + + @Test + public void minecraft118OreBoundsPreserveNegativeMinimumAndExclusiveMaximum320() + throws Exception { + Path directory = Files.createTempDirectory("mineralogy-118-ore-bounds"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + Files.write(config, ("[ores.sulfur_ore]\nminY=-64\nmaxY=320\nfrequency=2\nquantity=7\n") + .getBytes(StandardCharsets.UTF_8)); + LegacyOreConfigMigrator.migrate(config, null); + JsonObject sulfur = parse(directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE).toFile()) + .getAsJsonObject("ores").getAsJsonObject("mineralogy:ore/mineralogy/sulfur_ore") + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + assertEquals(-64, sulfur.get("min_y").getAsInt()); + assertEquals(319, sulfur.get("max_y").getAsInt()); + } + + @Test + public void allDefaultsProduceOnlyAByteStableReport() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-default-ores"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] source = ("[ores.sulfur_ore]\nminY=16\nmaxY=64\nfrequency=1.0\nquantity=16\n" + + "[ores.phosphorous_ore]\nminY=16\nmaxY=64\nfrequency=1.0\nquantity=16\n" + + "[ores.nitrate_ore]\nminY=16\nmaxY=64\nfrequency=1.0\nquantity=16\n") + .getBytes(StandardCharsets.UTF_8); + Files.write(config, source); + LegacyOreConfigMigrator.migrate(config, null); + Path report = directory.resolve(LegacyOreConfigMigrator.REPORT_FILE); + byte[] first = Files.readAllBytes(report); + assertFalse(Files.exists(directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE))); + LegacyOreConfigMigrator.migrate(config, null); + assertArrayEquals(first, Files.readAllBytes(report)); + assertArrayEquals(source, Files.readAllBytes(config)); + } + + @Test + public void mineralogySixGlobalJsonUsesStableProviderIdsWithoutRewritingItsSource() + throws Exception { + Path directory = Files.createTempDirectory("mineralogy-six-json"); + JsonObject provider = parse(new File( + "src/main/resources/data/mineralogy/orespawn/provider.json")); + JsonObject legacy = legacyMineralogySixJson(provider, 4); + JsonObject oldSulfur = legacy.getAsJsonObject("ores") + .getAsJsonObject("mineralogy:sulfur_ore") + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + oldSulfur.addProperty("frequency", 2.75D); + JsonObject vanilla = new JsonObject(); + vanilla.addProperty("enabled", false); + legacy.getAsJsonObject("ores").add("minecraft:coal_ore", vanilla); + + Path source = directory.resolve(LegacyMineralogy6ConfigMigrator.LEGACY_GLOBAL_FILE); + byte[] original = (legacy.toString() + "\r\n").getBytes(StandardCharsets.UTF_8); + Files.write(source, original); + + assertTrue(LegacyMineralogy6ConfigMigrator.migrateGlobalConfig(directory, null)); + Path target = directory.resolve(LegacyMineralogy6ConfigMigrator.ORESPAWN_GLOBAL_FILE); + JsonObject migrated = parse(target.toFile()); + assertEquals(6, migrated.get("schema_version").getAsInt()); + assertEquals(LegacyMineralogy6ConfigMigrator.LEGACY_GLOBAL_FILE, + migrated.get("migrated_from").getAsString()); + assertEquals(32, migrated.getAsJsonObject("rocks").entrySet().size()); + assertEquals(4, migrated.getAsJsonObject("ores").entrySet().size()); + assertTrue(migrated.getAsJsonObject("rocks") + .has("mineralogy:rock/minecraft/basalt")); + assertFalse(migrated.getAsJsonObject("rocks").has("minecraft:basalt")); + assertTrue(migrated.getAsJsonObject("ores") + .has("mineralogy:ore/mineralogy/sulfur_ore")); + assertFalse(migrated.getAsJsonObject("ores").has("mineralogy:sulfur_ore")); + assertTrue(migrated.getAsJsonObject("ores").has("minecraft:coal_ore")); + JsonObject sulfur = migrated.getAsJsonObject("ores") + .getAsJsonObject("mineralogy:ore/mineralogy/sulfur_ore"); + assertEquals("mineralogy:sulfur_ore", sulfur.get("block").getAsString()); + assertEquals("mineralogy", sulfur.get("source_provider").getAsString()); + assertEquals(2.75D, sulfur.getAsJsonObject("dimensions") + .getAsJsonObject("minecraft:overworld").get("frequency").getAsDouble(), 0.0D); + assertArrayEquals(original, Files.readAllBytes(source)); + + Path report = directory.resolve(LegacyMineralogy6ConfigMigrator.GLOBAL_REPORT_FILE); + String reportText = new String(Files.readAllBytes(report), StandardCharsets.UTF_8); + assertTrue(reportText.contains("canonicalized.rocks=32")); + assertTrue(reportText.contains("canonicalized.ores=3")); + byte[] firstTarget = Files.readAllBytes(target); + byte[] firstReport = Files.readAllBytes(report); + assertFalse(LegacyMineralogy6ConfigMigrator.migrateGlobalConfig(directory, null)); + assertArrayEquals(firstTarget, Files.readAllBytes(target)); + assertArrayEquals(firstReport, Files.readAllBytes(report)); + assertArrayEquals(original, Files.readAllBytes(source)); + } + + @Test + public void mineralogySixWorldProfileIsCanonicalizedBeforeOreSpawnLoadsIt() + throws Exception { + Path world = Files.createTempDirectory("mineralogy-six-world"); + Path serverConfig = world.resolve("serverconfig"); + Files.createDirectories(serverConfig); + JsonObject provider = parse(new File( + "src/main/resources/data/mineralogy/orespawn/provider.json")); + JsonObject legacy = legacyMineralogySixJson(provider, 3); + Path source = serverConfig.resolve(LegacyMineralogy6ConfigMigrator.LEGACY_WORLD_FILE); + byte[] original = (legacy.toString() + "\n").getBytes(StandardCharsets.UTF_8); + Files.write(source, original); + + assertTrue(LegacyMineralogy6ConfigMigrator.migrateWorldProfile(world, null)); + Path target = serverConfig.resolve(LegacyMineralogy6ConfigMigrator.ORESPAWN_WORLD_FILE); + JsonObject migrated = parse(target.toFile()); + assertEquals(5, migrated.get("schema_version").getAsInt()); + assertEquals(32, migrated.getAsJsonObject("rocks").entrySet().size()); + assertEquals(3, migrated.getAsJsonObject("ores").entrySet().size()); + assertTrue(migrated.getAsJsonObject("rocks") + .has("mineralogy:rock/mineralogy/limestone")); + assertTrue(Files.isRegularFile(serverConfig.resolve( + LegacyMineralogy6ConfigMigrator.WORLD_REPORT_FILE))); + assertArrayEquals(original, Files.readAllBytes(source)); + + byte[] firstTarget = Files.readAllBytes(target); + assertFalse(LegacyMineralogy6ConfigMigrator.migrateWorldProfile(world, null)); + assertArrayEquals(firstTarget, Files.readAllBytes(target)); + assertArrayEquals(original, Files.readAllBytes(source)); + } + + @Test + public void establishedOreSpawnJsonAndMalformedMineralogyJsonAreNeverReplaced() + throws Exception { + Path establishedDirectory = Files.createTempDirectory("mineralogy-six-established"); + Files.write(establishedDirectory.resolve( + LegacyMineralogy6ConfigMigrator.LEGACY_GLOBAL_FILE), "{}\n".getBytes(StandardCharsets.UTF_8)); + Path establishedTarget = establishedDirectory.resolve( + LegacyMineralogy6ConfigMigrator.ORESPAWN_GLOBAL_FILE); + byte[] established = "{\"established\":true}\n".getBytes(StandardCharsets.UTF_8); + Files.write(establishedTarget, established); + assertFalse(LegacyMineralogy6ConfigMigrator.migrateGlobalConfig(establishedDirectory, null)); + assertArrayEquals(established, Files.readAllBytes(establishedTarget)); + + Path malformedDirectory = Files.createTempDirectory("mineralogy-six-malformed"); + byte[] malformed = "not json\r\n".getBytes(StandardCharsets.UTF_8); + Path malformedSource = malformedDirectory.resolve( + LegacyMineralogy6ConfigMigrator.LEGACY_GLOBAL_FILE); + Files.write(malformedSource, malformed); + assertFalse(LegacyMineralogy6ConfigMigrator.migrateGlobalConfig(malformedDirectory, null)); + assertFalse(Files.exists(malformedDirectory.resolve( + LegacyMineralogy6ConfigMigrator.ORESPAWN_GLOBAL_FILE))); + assertArrayEquals(malformed, Files.readAllBytes(malformedSource)); + } + + @Test + public void documentationExportIsMissingOnlyAndCopiesExactProvider() throws Exception { + Path output = Files.createTempDirectory("mineralogy-guide"); + assertEquals(7, DocumentationExporter.exportMissing(output)); + assertEquals(0, DocumentationExporter.exportMissing(output)); + Path readme = output.resolve("README.md"); + byte[] edited = "player edit\n".getBytes(StandardCharsets.UTF_8); + Files.write(readme, edited); + Files.delete(output.resolve("PLAYER_GUIDE.md")); + assertEquals(1, DocumentationExporter.exportMissing(output)); + assertArrayEquals(edited, Files.readAllBytes(readme)); + assertArrayEquals(Files.readAllBytes(new File( + "src/main/resources/data/mineralogy/orespawn/provider.json").toPath()), + Files.readAllBytes(output.resolve("examples/mineralogy-provider.json"))); + try (Stream files = Files.walk(output)) { + assertFalse(files.anyMatch(path -> path.getFileName().toString().endsWith(".tmp"))); + } + } + + private static JsonObject parse(File file) throws Exception { + try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { + return new JsonParser().parse(reader).getAsJsonObject(); + } + } + + private static JsonObject legacyMineralogySixJson(JsonObject provider, int schema) { + JsonObject legacy = new JsonObject(); + legacy.addProperty("schema_version", schema); + for (String sectionName : new String[] { "rocks", "ores" }) { + JsonObject section = new JsonObject(); + for (java.util.Map.Entry entry + : provider.getAsJsonObject(sectionName).entrySet()) { + JsonObject rule = entry.getValue().getAsJsonObject().deepCopy(); + String block = rule.get("block").getAsString(); + rule.remove("block"); + rule.remove("source_provider"); + section.add(block, rule); + } + legacy.add(sectionName, section); + } + return legacy; + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/CoremodNamespaceTest.java b/src/test/java/zone/moddev/mc/mineralogy/CoremodNamespaceTest.java deleted file mode 100644 index 8c5b2ed1b..000000000 --- a/src/test/java/zone/moddev/mc/mineralogy/CoremodNamespaceTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package zone.moddev.mc.mineralogy; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; - -import org.junit.jupiter.api.Test; - -class CoremodNamespaceTest { - private static final String COREMOD_RESOURCE = "/coremods/mineralogy_legacy_world_fix.js"; - private static final String CURRENT_HOOK = "zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook"; - private static final String LEGACY_HOOK = "com/mcmoddev/mineralogy/patching/LegacyWorldDataHook"; - - @Test - void coremodTargetsCurrentLegacyWorldDataHookPackage() throws IOException { - try (InputStream stream = CoremodNamespaceTest.class.getResourceAsStream(COREMOD_RESOURCE)) { - assertNotNull(stream, "Missing packaged Mineralogy legacy-world coremod"); - String coremod = new String(stream.readAllBytes(), StandardCharsets.UTF_8); - - assertFalse(coremod.contains(LEGACY_HOOK), "Coremod still targets the retired package"); - assertEquals(4, countOccurrences(coremod, CURRENT_HOOK)); - } - } - - private static int countOccurrences(String value, String target) { - int count = 0; - int offset = 0; - while ((offset = value.indexOf(target, offset)) >= 0) { - count++; - offset += target.length(); - } - return count; - } -} diff --git a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java new file mode 100644 index 000000000..ce2b31db6 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java @@ -0,0 +1,177 @@ +package zone.moddev.mc.mineralogy; + +import org.junit.Test; +import zone.moddev.mc.mineralogy.data.MaterialData; +import zone.moddev.mc.mineralogy.blocks.Ore; +import zone.moddev.mc.mineralogy.blocks.Rock; +import zone.moddev.mc.mineralogy.blocks.RockRelief; +import zone.moddev.mc.mineralogy.blocks.RockSlab; +import zone.moddev.mc.mineralogy.blocks.RockStairs; +import zone.moddev.mc.mineralogy.blocks.RockWall; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.HashSet; +import java.util.Set; + +import static org.junit.Assert.*; + +public class GameplayContractTest { + @Test + public void novaculiteAndRockFamilyContractsAreStable() { + assertEquals(3.0D, MaterialData.NOVACULITE.hardness, 0.0D); + assertEquals(15.0D, MaterialData.NOVACULITE.blastResistance, 0.0D); + assertEquals(1, MaterialData.NOVACULITE.toolHardnessLevel); + assertEquals(27, MaterialData.allIncludingRockSalt().size()); + Set ids = new HashSet(); + MaterialData.allIncludingRockSalt().forEach(material -> ids.add(material.id())); + assertEquals(27, ids.size()); + assertTrue(ids.contains("rock_salt")); + } + + @Test + public void creativePolicyUsesReliefBeforeSlabAndFiveGroups() throws Exception { + String source = text("src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java"); + assertTrue(source.indexOf("RockRelief.class") < source.indexOf("RockSlab.class")); + assertTrue(source.contains("enum ContentGroup { ROCK, STAIR, SLAB, WALL, ITEM }")); + String groups = text("src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java"); + assertTrue(groups.contains("create(\"rock\", \"basalt\")")); + assertTrue(groups.contains("create(\"stair\", \"basalt_stairs\")")); + assertTrue(groups.contains("create(\"slab\", \"basalt_slab\")")); + assertTrue(groups.contains("create(\"wall\", \"basalt_wall\")")); + assertTrue(groups.contains("create(\"item\", \"sulfur_dust\")")); + assertTrue(groups.contains("CreativeModeTab.TAB_MATERIALS")); + assertTrue(groups.contains("public boolean hasSearchBar()")); + assertTrue(groups.contains("textures/gui/container/creative_inventory/tab_item_search.png")); + + CreativeTabPolicy grouped = new CreativeTabPolicy(true); + assertTrue(grouped.groupTabsByType()); + assertEquals(CreativeTabPolicy.ContentGroup.ROCK, grouped.groupFor(Rock.class)); + assertEquals(CreativeTabPolicy.ContentGroup.ROCK, grouped.groupFor(Ore.class)); + assertEquals(CreativeTabPolicy.ContentGroup.STAIR, grouped.groupFor(RockStairs.class)); + assertEquals(CreativeTabPolicy.ContentGroup.SLAB, grouped.groupFor(RockSlab.class)); + assertEquals(CreativeTabPolicy.ContentGroup.WALL, grouped.groupFor(RockWall.class)); + assertEquals(CreativeTabPolicy.ContentGroup.ITEM, grouped.groupFor(RockRelief.class)); + assertEquals(CreativeTabPolicy.ContentGroup.ITEM, grouped.groupFor(Object.class)); + assertFalse(new CreativeTabPolicy(false).groupTabsByType()); + } + + @Test + public void dropsSlabsAndFurnacePersistenceFollowAcceptedSemantics() throws Exception { + String chert = text("src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java"); + assertTrue(chert.contains("if (prng.nextInt(10) == 0)")); + assertTrue(chert.contains("return super.getDrops(state, builder);")); + String rock = text("src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java"); + assertTrue(rock.contains("return Collections.singletonList(new ItemStack(Blocks.COBBLESTONE));")); + String slab = text("src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java"); + assertTrue(slab.contains("new ItemStack(drops, 2)")); + assertTrue(slab.contains("Collections.singletonList(new ItemStack(fullBlock))")); + String furnace = text("src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java"); + assertTrue(furnace.contains("public TileEntityRockFurnace(BlockPos pos, BlockState state)")); + assertTrue(furnace.contains("BlockState state = getBlockState()")); + assertTrue(furnace.contains("Block block = state.getBlock()")); + assertTrue(furnace.contains("getBurnModifier()")); + assertTrue(furnace.contains("ContainerHelper.loadAllItems")); + + String lamp = text("src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java"); + assertTrue(lamp.contains("facing.getAxis().isVertical()")); + assertTrue(lamp.contains("Block.canSupportCenter(world, supportPos, facing)")); + } + + @Test + public void cobblestonePolicyReappliesAfterReloadAndKeepsSpecialCases() throws Exception { + String policy = text("src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java"); + assertTrue(policy.contains("onTagsUpdated(TagsUpdatedEvent event)")); + assertFalse(policy.contains("onServerAboutToStart")); + assertTrue(policy.contains("event.getTagManager()")); + assertTrue(policy.contains("event.shouldUpdateStaticData()")); + assertTrue(policy.contains("MaterialData.allIncludingRockSalt()")); + assertTrue(policy.contains("\"stones/\" + material.id()")); + assertTrue(policy.contains("rawRockHolders(blockRegistry")); + assertTrue(policy.contains("rawRockHolders(itemRegistry")); + assertTrue(policy.contains("\"chert\", \"pumice\"")); + assertTrue(policy.contains("blockRegistry.bindTags(blockTags)")); + assertTrue(policy.contains("itemRegistry.bindTags(itemTags)")); + assertTrue(policy.contains("STONE_CRAFTING_MATERIALS")); + assertTrue(policy.contains("STONE_TOOL_MATERIALS")); + assertTrue(policy.contains("TagKey.create")); + assertFalse(policy.contains("java.lang.reflect")); + assertTrue(policy.contains("Ingredient.invalidateAll()")); + } + + @Test + public void optionalGunpowderDustsCannotCollapseToTwoIngredients() throws Exception { + String generator = text("scripts/generate-recipes.ps1"); + assertTrue(generator.contains("ItemTagNotEmptyCondition 'forge:dusts/carbon'")); + assertTrue(generator.contains("ItemTagNotEmptyCondition 'forge:dusts/coal'")); + assertTrue(generator.contains("type = 'forge:not'")); + assertTrue(generator.contains("type = 'forge:tag_empty'")); + } + + @Test + public void forge40OilUsesNativeFlowingFluidRendering() 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")); + assertTrue(fluid.contains("LiquidBlock")); + assertTrue(fluid.contains("MineralogyBucketItem")); + assertTrue(fluid.contains("blocks/crude_oil_still")); + assertTrue(fluid.contains("blocks/crude_oil_flow")); + 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(new File("src/main/java/zone/moddev/mc/mineralogy/client/ClientOilRenderer.java").exists()); + } + + @Test + public void legacyWorldConversionPreservesIndexedChunksAndFurnaces() throws Exception { + String hook = text("src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java"); + assertTrue(hook.contains("blocks.length != 4096")); + assertTrue(hook.contains("MineralogyLegacyPreserveChunk")); + assertTrue(hook.contains("TerrainPopulated")); + assertTrue(hook.contains("LightPopulated")); + assertTrue(hook.contains("rewriteLegacyRockFurnaceTileEntities")); + assertTrue(hook.contains("tileEntity.putString(\"id\", ROCK_FURNACE_TILE_ENTITY)")); + + String transformer = text("src/main/resources/coremods/mineralogy_legacy_world_fix.js"); + assertTrue(transformer.contains("mineralogy_legacy_chunk_data")); + assertTrue(transformer.contains("net.minecraft.world.level.chunk.storage.ChunkStorage")); + assertTrue(transformer.contains("prepareLegacyChunk")); + assertTrue(transformer.contains("finalizeLegacyChunk")); + + String mappings = text("src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java"); + assertTrue(mappings.contains("GRASS_PATH")); + assertTrue(mappings.contains("DIRT_PATH")); + assertTrue(mappings.contains("SWEET_BERRIES_PICK")); + assertTrue(mappings.contains("SWEET_BERRY_BUSH_PICK")); + assertTrue(mappings.contains("ForgeRegistries.SOUND_EVENTS")); + assertTrue(mappings.contains("bus = Mod.EventBusSubscriber.Bus.FORGE")); + assertTrue(mappings.contains("event.getAllMappings()")); + } + + @Test + public void legacyFlatteningUsesTheExpandedArrayAndReinstallsTheSelectedWorldMapping() throws Exception { + String hook = text("src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java"); + assertTrue(hook.contains("expandFlatteningTable(highestStateId + 1)")); + 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, Path levelPath)")); + assertTrue(hook.contains("writeSidecar(levelDat.getParentFile(), blocks)")); + assertTrue(hook.contains("prepareLegacyWorld(levelDat)")); + + String build = text("build.gradle"); + assertTrue(build.contains("dependsOn tasks.named('processResources')")); + assertTrue(build.contains("mineralogy%%${mainOutput}")); + assertTrue(build.contains("from processedResources")); + assertTrue(build.contains("data/mineralogy/orespawn/provider.json")); + assertTrue(build.contains("Eclipse output contains stale processed production resources")); + assertTrue(build.contains("examples/mineralogy-provider.json")); + assertTrue(build.contains("Eclipse output is missing bundled documentation")); + } + + private static String text(String path) throws Exception { + return new String(Files.readAllBytes(new File(path).toPath()), StandardCharsets.UTF_8); + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/LocalizationParityTest.java b/src/test/java/zone/moddev/mc/mineralogy/LocalizationParityTest.java deleted file mode 100644 index 9b7dab071..000000000 --- a/src/test/java/zone/moddev/mc/mineralogy/LocalizationParityTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package zone.moddev.mc.mineralogy; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.Reader; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import org.junit.jupiter.api.Test; - -class LocalizationParityTest { - private static final Path LANG_DIR = Paths.get("src", "main", "resources", "assets", "mineralogy", "lang"); - private static final Set REQUIRED_LOCALES = new HashSet<>(Arrays.asList( - "pt_br.json", "ru_ru.json", "ko_kr.json", "ja_jp.json")); - - @Test - void everyLocaleMatchesEnglishKeysAndFormatting() throws Exception { - JsonObject english = read(LANG_DIR.resolve("en_us.json")); - Set englishKeys = english.keySet(); - Set localeFiles = new HashSet<>(); - - try (java.util.stream.Stream files = Files.list(LANG_DIR)) { - for (Path file : (Iterable) files - .filter(path -> path.getFileName().toString().endsWith(".json")) - .sorted()::iterator) { - String locale = file.getFileName().toString(); - localeFiles.add(locale); - JsonObject translations = read(file); - - assertEquals(englishKeys, translations.keySet(), locale + " must match en_us keys exactly"); - for (String key : englishKeys) { - JsonElement translated = translations.get(key); - assertTrue(translated.isJsonPrimitive() && translated.getAsJsonPrimitive().isString(), - locale + " value for " + key + " must be a string"); - assertFalse(translated.getAsString().trim().isEmpty(), locale + " value for " + key + " is blank"); - assertEquals(formatArgumentCount(english.get(key).getAsString()), - formatArgumentCount(translated.getAsString()), - locale + " changes the format arguments for " + key); - } - } - } - - assertTrue(localeFiles.containsAll(REQUIRED_LOCALES), "Required new locales are missing"); - } - - private static int formatArgumentCount(String value) { - int count = 0; - for (int i = 0; i < value.length() - 1; i++) { - if (value.charAt(i) == '%' && value.charAt(i + 1) == 's') count++; - } - return count; - } - - private static JsonObject read(Path path) throws Exception { - try (Reader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) { - return JsonParser.parseReader(reader).getAsJsonObject(); - } - } -} diff --git a/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java new file mode 100644 index 000000000..8d63050a9 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java @@ -0,0 +1,179 @@ +package zone.moddev.mc.mineralogy; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.Test; + +import java.io.File; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static org.junit.Assert.*; + +/** Quality policy for the reviewed 1.18.2 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( + "en_ca.json", "en_en.json", "en_gb.json", "en_pt.json", "en_us.json")); + private static final Set NON_LATIN_LOCALES = new HashSet(Arrays.asList( + "ja_jp.json", "ko_kr.json", "ru_ru.json", "zh_cn.json")); + private static final Pattern FORMAT_ARGUMENT = Pattern.compile("%(?:\\d+\\$)?[a-zA-Z%]"); + private static final Pattern LATIN_WORD = Pattern.compile("[A-HJ-Za-hj-z]{2,}"); + + @Test + public void everyLocaleIsUtf8JsonWithStableFormatting() throws Exception { + Map english = read(new File(LANG_DIR, "en_us.json")); + File[] files = LANG_DIR.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + assertEquals(17, files.length); + + for (File file : files) { + byte[] bytes = Files.readAllBytes(file.toPath()); + assertFalse(file.getName() + " must not contain a UTF-8 BOM", + bytes.length >= 3 && bytes[0] == (byte) 0xef + && bytes[1] == (byte) 0xbb && bytes[2] == (byte) 0xbf); + String content = new String(bytes, StandardCharsets.UTF_8); + assertFalse(file.getName() + " contains a replacement character", content.contains("\ufffd")); + assertTrue(file.getName() + " must end with a newline", content.endsWith("\n")); + for (String line : content.split("\\n", -1)) { + assertEquals(file.getName() + " has trailing whitespace", line, line.replaceFirst("[ \\t]+$", "")); + } + + Map translations = read(file); + assertEquals(file.getName(), new ArrayList(english.keySet()), + new ArrayList(translations.keySet())); + for (String key : english.keySet()) { + assertFalse(file.getName() + " has a blank value for " + key, translations.get(key).trim().isEmpty()); + assertEquals(file.getName() + " changes formatting arguments for " + key, + formatArguments(english.get(key)), formatArguments(translations.get(key))); + } + } + } + + @Test + public void nonEnglishLocalesOnlyMatchReviewedTechnicalTerms() throws Exception { + Map english = read(new File(LANG_DIR, "en_us.json")); + Map> allowed = reviewedEnglishMatches(); + File[] files = LANG_DIR.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + + for (File file : files) { + if (ENGLISH_LOCALES.contains(file.getName())) continue; + Map translations = read(file); + Set actual = new HashSet(); + for (String key : english.keySet()) { + if (english.get(key).equals(translations.get(key))) actual.add(key); + } + assertEquals(file.getName() + " has an unreviewed English fallback", + allowed.containsKey(file.getName()) ? allowed.get(file.getName()) : Collections.emptySet(), actual); + } + } + + @Test + public void nonEnglishLocalesContainNoEmbeddedEnglishUiFragments() throws Exception { + Map forbidden = forbiddenEnglishByLocale(); + File[] files = LANG_DIR.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + for (File file : files) { + if (ENGLISH_LOCALES.contains(file.getName())) continue; + for (Map.Entry entry : read(file).entrySet()) { + if (NON_LATIN_LOCALES.contains(file.getName())) { + assertFalse(file.getName() + " contains an English word in " + entry, + LATIN_WORD.matcher(entry.getValue()).find()); + } else { + Pattern pattern = forbidden.get(file.getName()); + assertNotNull("Missing forbidden-word policy for " + file.getName(), pattern); + assertFalse(file.getName() + " contains an English UI fragment in " + entry, + pattern.matcher(entry.getValue()).find()); + } + } + } + } + + @Test + public void representativeTranslationsCoverGeologyTabsAndOil() throws Exception { + assertLocale("de_de.json", "block.mineralogy.shale", "Tonschiefer"); + assertLocale("de_de.json", "item.mineralogy.crude_oil_bucket", "Roh\u00f6leimer"); + assertLocale("es_es.json", "block.mineralogy.siltstone", "Limolita"); + assertLocale("fr_fr.json", "block.mineralogy.hornfels", "Corn\u00e9enne"); + assertLocale("pt_br.json", "block.mineralogy.shale", "Folhelho"); + assertLocale("ja_jp.json", "block.mineralogy.conglomerate", "\u792b\u5ca9"); + assertLocale("ko_kr.json", "block.mineralogy.gabbro", "\ubc18\ub824\uc554"); + assertLocale("ru_ru.json", "item.mineralogy.crude_oil_bucket", "\u0412\u0435\u0434\u0440\u043e \u0441\u044b\u0440\u043e\u0439 \u043d\u0435\u0444\u0442\u0438"); + assertLocale("zh_cn.json", "itemGroup.mineralogy.item", "\u77ff\u7269\u5b66\u7269\u54c1"); + } + + private static void assertLocale(String locale, String key, String expected) throws Exception { + assertEquals(expected, read(new File(LANG_DIR, locale)).get(key)); + } + + private static Map> reviewedEnglishMatches() { + Set german = new HashSet(Arrays.asList( + "block.mineralogy.basalt", "block.mineralogy.gabbro", "block.mineralogy.hornfels")); + Set french = new HashSet(Arrays.asList( + "block.mineralogy.amphibolite", "block.mineralogy.chert", "block.mineralogy.diabase", + "block.mineralogy.diorite", "block.mineralogy.gabbro", "block.mineralogy.gneiss", + "block.mineralogy.granite", "block.mineralogy.nitrate_block", + "block.mineralogy.novaculite", "block.mineralogy.pegmatite", + "block.mineralogy.quartzite", "block.mineralogy.rhyolite")); + Map> allowed = new HashMap>(); + allowed.put("de_au.json", german); + allowed.put("de_de.json", german); + allowed.put("fr_ca.json", french); + allowed.put("fr_fr.json", french); + return allowed; + } + + private static Map forbiddenEnglishByLocale() { + String common = "Polished|Wall|Furnace|Hoe|Pickaxe|Sword|Blank|Left|Right|Street|" + + "Dust|Ore|Bucket|Fertilizer|Crude|Oil|Stairs|Slab|Brick|Smooth|Drywall|Axe|Cross"; + Map forbidden = new HashMap(); + forbidden.put("de_au.json", words(common)); + forbidden.put("de_de.json", words(common)); + forbidden.put("es_es.json", words(common + "|Hammer|Relief|Gabbro|Siltstone|Phyllite|Hornfels|Tuff|Slate|Scoria|Plus")); + forbidden.put("es_mx.json", forbidden.get("es_es.json")); + forbidden.put("fr_ca.json", words(common + "|Hammer|Siltstone|Phyllite|Tuff|Slate|Scoria")); + forbidden.put("fr_fr.json", forbidden.get("fr_ca.json")); + forbidden.put("pt_br.json", words(common + "|Hammer|Relief|Gabbro|Siltstone|Phyllite|Hornfels|Tuff|Slate|Scoria|Plus")); + forbidden.put("pt_pt.json", forbidden.get("pt_br.json")); + return forbidden; + } + + private static Pattern words(String alternatives) { + return Pattern.compile("\\b(?:" + alternatives + ")\\b", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE); + } + + private static List formatArguments(String value) { + List result = new ArrayList(); + Matcher matcher = FORMAT_ARGUMENT.matcher(value); + while (matcher.find()) result.add(matcher.group()); + return result; + } + + 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(); + } + Map values = new LinkedHashMap(); + for (Map.Entry entry : object.entrySet()) { + assertTrue(file.getName() + " contains a non-string value for " + entry.getKey(), + entry.getValue().isJsonPrimitive() && entry.getValue().getAsJsonPrimitive().isString()); + values.put(entry.getKey(), entry.getValue().getAsString()); + } + return values; + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java new file mode 100644 index 000000000..1e5ee3067 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java @@ -0,0 +1,348 @@ +package zone.moddev.mc.mineralogy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.Reader; +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 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.SharedConstants; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.Bootstrap; +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.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 org.junit.BeforeClass; +import org.junit.Test; + +/** Exercises generated overrides through Forge conditions and Minecraft's recipe deserializers. */ +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(); + Bootstrap.bootStrap(); + CraftingHelper.register(NotCondition.Serializer.INSTANCE); + CraftingHelper.register(new ResourceLocation("minecraft", "item"), + VanillaIngredientSerializer.INSTANCE); + MineralogyConfig.registerRecipeConditions(); + } + + @Test + public void enabledNativeAndLegacyFamilyRepresentativesMatchEveryCoveredVanillaRecipe() + 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 " + Registry.ITEM.getKey(rock), + recipe.matches(inventory, null)); + String expectedOutput = recipeName.startsWith("mossy_cobblestone_from_") + ? "minecraft:mossy_cobblestone" : "minecraft:" + recipeName; + assertEquals(recipeName, expectedOutput, + Registry.ITEM.getKey(recipe.getResultItem().getItem()).toString()); + } + } + } finally { + Registry.ITEM.bindTags(previous); + } + } + + @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 " + Registry.ITEM.getKey(rock), + recipe.matches(inventory(recipeName, rock), null)); + } + assertTrue(recipeName, recipe.matches(inventory(recipeName, Blocks.COBBLESTONE.asItem()), null)); + // Stand-ins for always-tagged Mineralogy chert and pumice. + 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 { + Registry.ITEM.bindTags(previous); + } + } + + @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]); + } + } + + private static void assertSlabConversion(String prefix, Item vanilla) + 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().getItem()); + assertEquals(prefix, 1, toVanilla.getResultItem().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().getItem()); + assertEquals(prefix, 1, fromVanilla.getResultItem().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())); + Registry.ITEM.bindTags(tags); + } + + private static Map, List>> snapshotItemTags() { + Map, List>> result = new IdentityHashMap<>(); + Registry.ITEM.getTags().forEach(pair -> { + List> holders = new ArrayList<>(); + pair.getSecond().forEach(holders::add); + result.put(pair.getFirst(), holders); + }); + return result; + } + + private static List> holders(Item... items) { + List> result = new ArrayList<>(); + for (Item item : items) { + ResourceKey key = Registry.ITEM.getResourceKey(item).get(); + result.add(Registry.ITEM.getHolderOrThrow(key)); + } + return result; + } + + private static TagKey tagKey(String value) { + return TagKey.create(Registry.ITEM_REGISTRY, new ResourceLocation(value)); + } + + 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 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"))) { + selected = candidate.getAsJsonObject("recipe"); + break; + } + } + 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; + } + + private static CraftingRecipe mineralogyRecipe(String name, Item mineralogyStandIn) + throws Exception { + JsonObject data = json(new File(MINERALOGY_RECIPE_ROOT, name + ".json")); + String standInId = Registry.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 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)); + } + + 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 CraftingContainer shaped(String[] pattern, Map ingredients) { + CraftingContainer inventory = new CraftingContainer(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(ItemStack... stacks) { + CraftingContainer inventory = new CraftingContainer(dummyContainer(), 3, 3); + for (int index = 0; index < stacks.length; index++) inventory.setItem(index, stacks[index]); + return inventory; + } + + private static AbstractContainerMenu dummyContainer() { + return new AbstractContainerMenu(null, -1) { + @Override + public boolean stillValid(Player playerIn) { + return false; + } + }; + } + + private static String[] recipeNames() { + return new String[] { "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" }; + } + + 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(); + } + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/OreSpawnProviderTest.java b/src/test/java/zone/moddev/mc/mineralogy/OreSpawnProviderTest.java deleted file mode 100644 index 036714daf..000000000 --- a/src/test/java/zone/moddev/mc/mineralogy/OreSpawnProviderTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package zone.moddev.mc.mineralogy; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.Reader; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import org.junit.jupiter.api.Test; - -class OreSpawnProviderTest { - private static final Path PROVIDER = Paths.get("src", "main", "resources", "data", - "mineralogy", "orespawn", "provider.json"); - - @Test - void packagedProviderIsACompleteSchemaThreeDeclaration() throws Exception { - JsonObject root; - try (Reader reader = Files.newBufferedReader(PROVIDER, StandardCharsets.UTF_8)) { - root = JsonParser.parseReader(reader).getAsJsonObject(); - } - - assertEquals(3, root.get("schema_version").getAsInt()); - assertEquals("mineralogy", root.get("provider_modid").getAsString()); - assertEquals(3, root.get("provider_revision").getAsInt()); - assertEquals(32, root.getAsJsonObject("rocks").size()); - assertEquals(3, root.getAsJsonObject("ores").size()); - assertFalse(root.getAsJsonObject("ores").has("mineralogy:ore/minecraft/coal_ore")); - assertTrue(root.getAsJsonObject("profile_defaults").get("place_fluid_deposits").getAsBoolean()); - assertEquals(1, root.getAsJsonObject("fluid_deposits").size()); - JsonObject oil = root.getAsJsonObject("fluid_deposits") - .getAsJsonObject("mineralogy:fluid_deposit/crude_oil"); - assertEquals("mineralogy:crude_oil", oil.get("block").getAsString()); - JsonObject overworld = oil.getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); - assertEquals("sedimentary", overworld.getAsJsonArray("host_families").get(0).getAsString()); - assertEquals("OCEAN", overworld.getAsJsonArray("biome_dictionary").get(0).getAsString()); - assertEquals(2, overworld.get("min_solid_cover").getAsInt()); - assertEquals("minecraft:basalt", root.getAsJsonObject("profile_defaults") - .getAsJsonObject("worldgen_aliases").get("mineralogy:basalt").getAsString()); - assertFalse(root.getAsJsonObject("rocks").has("mineralogy:basalt")); - } -} diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java new file mode 100644 index 000000000..fc19bcc82 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -0,0 +1,766 @@ +package zone.moddev.mc.mineralogy; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.Test; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.*; + +public class ResourceContractTest { + private static final File ROOT = new File("src/main/resources"); + + @Test + public void providerUsesOreSpawnFourAndOwnsNoVanillaGeneration() throws Exception { + JsonObject provider = json(new File(ROOT, "data/mineralogy/orespawn/provider.json")); + assertEquals(4, provider.get("schema_version").getAsInt()); + assertEquals(3, provider.get("provider_revision").getAsInt()); + assertEquals("mineralogy", provider.get("provider_modid").getAsString()); + assertEquals(32, provider.getAsJsonObject("rocks").size()); + assertEquals(3, provider.getAsJsonObject("ores").size()); + assertEquals(1, provider.getAsJsonObject("fluid_deposits").size()); + assertFalse(provider.getAsJsonObject("profile_defaults").get("manage_vanilla_ores").getAsBoolean()); + JsonObject dimensions = provider.getAsJsonObject("profile_defaults").getAsJsonObject("terrain_dimensions"); + assertEquals(1, dimensions.size()); + assertTrue(dimensions.has("minecraft:overworld")); + String text = new String(Files.readAllBytes(new File(ROOT, + "data/mineralogy/orespawn/provider.json").toPath()), StandardCharsets.UTF_8); + assertTrue(text.contains("\"minecraft:andesite\"")); + assertTrue(text.contains("\"minecraft:diorite\"")); + assertTrue(text.contains("\"minecraft:granite\"")); + JsonObject defaults = provider.getAsJsonObject("profile_defaults"); + assertEquals("minecraft:basalt", defaults.getAsJsonObject("worldgen_aliases") + .get("mineralogy:basalt").getAsString()); + assertEquals("minecraft:basalt", provider.getAsJsonObject("rocks") + .getAsJsonObject("mineralogy:rock/minecraft/basalt").get("block").getAsString()); + assertEquals("minecraft:tuff", provider.getAsJsonObject("rocks") + .getAsJsonObject("mineralogy:rock/minecraft/tuff").get("block").getAsString()); + assertFalse(text.contains("metadata")); + assertTrue(text.contains("minecraft:deepslate")); + assertTrue(text.contains("minecraft:stone_ore_replaceables")); + assertTrue(text.contains("minecraft:deepslate_ore_replaceables")); + for (Map.Entry entry : provider.getAsJsonObject("rocks").entrySet()) { + JsonObject rock = entry.getValue().getAsJsonObject(); + assertEquals(entry.getKey(), -64, rock.get("min_y").getAsInt()); + assertEquals(entry.getKey(), 319, rock.get("max_y").getAsInt()); + } + JsonObject oil = provider.getAsJsonObject("fluid_deposits") + .getAsJsonObject("mineralogy:fluid_deposit/crude_oil") + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + assertEquals(-48, oil.get("min_y").getAsInt()); + assertEquals(48, oil.get("max_y").getAsInt()); + } + + @Test + public void everyRecipeHasAProgressiveAdvancement() throws Exception { + File recipeDir = new File(ROOT, "data/mineralogy/recipes"); + File advancementDir = new File(ROOT, "data/mineralogy/advancements/recipes"); + File[] recipes = recipeDir.listFiles((dir, name) -> name.endsWith(".json")); + File[] advancements = advancementDir.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(recipes); + assertNotNull(advancements); + assertEquals(1427, recipes.length); + assertEquals(1427, advancements.length); + + Set advancementNames = new HashSet(); + for (File file : advancements) advancementNames.add(file.getName()); + for (File recipeFile : recipes) { + JsonObject recipe = json(recipeFile); + assertFalse(recipeFile.getName(), recipe.get("type").getAsString().startsWith("forge:ore_")); + assertTrue(recipeFile.getName(), advancementNames.contains(recipeFile.getName())); + JsonObject advancement = json(new File(advancementDir, recipeFile.getName())); + assertEquals("mineralogy:" + stripJson(recipeFile.getName()), + 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")); + } else { + assertFalse(recipeFile.getName(), advancement.has("conditions")); + } + } + + JsonObject smooth = json(new File(advancementDir, "basalt_smooth.json")); + assertEquals("mineralogy:basalt", criterionItem(smooth, "has_rock")); + assertTrue(smooth.getAsJsonObject("criteria").has("has_sand")); + assertAdvancementIngredient("basalt_smooth_stairs", "tag", + "mineralogy:stones/basalt/smooth"); + assertAdvancementIngredient("basalt_relief_blank", "tag", + "mineralogy:stones/basalt/smooth"); + JsonObject marked = json(new File(advancementDir, "basalt_relief_pickaxe.json")); + assertEquals("mineralogy:basalt_relief_blank", criterionItem(marked, "has_rock")); + JsonObject right = json(new File(advancementDir, "basalt_relief_right.json")); + assertEquals("mineralogy:basalt_relief_left", criterionItem(right, "has_rock")); + } + + @Test + public void advancementsUseMinecraft117ItemPredicateSchema() throws Exception { + File mineralogy = new File(ROOT, "data/mineralogy/advancements"); + for (File file : jsonFiles(mineralogy)) { + JsonObject advancement = json(file); + if (advancement.has("criteria")) { + assertInventoryPredicates(file.getPath(), advancement); + } + } + + File minecraft = new File(ROOT, "data/minecraft/advancements/recipes"); + for (File file : jsonFiles(minecraft)) { + JsonObject wrapper = json(file); + if (wrapper.has("advancements")) { + for (JsonElement branch : wrapper.getAsJsonArray("advancements")) { + assertInventoryPredicates(file.getPath(), branch.getAsJsonObject() + .getAsJsonObject("advancement")); + } + } else { + assertInventoryPredicates(file.getPath(), wrapper); + } + } + } + + @Test + public void rockFurnacesUnlockFromTheirMatchingSlabs() throws Exception { + File advancementDir = new File(ROOT, "data/mineralogy/advancements/recipes"); + File[] furnaces = advancementDir.listFiles((dir, name) -> name.endsWith("_furnace.json")); + assertNotNull(furnaces); + assertEquals(108, furnaces.length); + + for (File file : furnaces) { + JsonObject advancement = json(file); + JsonObject criteria = advancement.getAsJsonObject("criteria"); + assertTrue(file.getName(), criteria.has("has_rock")); + assertFalse(file.getName(), criteria.has("has_furnace")); + String expectedSlabTag = expectedSlabTag(stripJson(file.getName())); + assertAdvancementIngredient(stripJson(file.getName()), "tag", expectedSlabTag); + + JsonArray requirements = advancement.getAsJsonArray("requirements"); + assertEquals(file.getName(), 1, requirements.size()); + JsonArray unlockAlternatives = requirements.get(0).getAsJsonArray(); + assertEquals(file.getName(), 2, unlockAlternatives.size()); + assertEquals(file.getName(), "has_the_recipe", unlockAlternatives.get(0).getAsString()); + assertEquals(file.getName(), "has_rock", unlockAlternatives.get(1).getAsString()); + } + } + + @Test + public void nativeRockAliasesDriveRecipesAndAdvancementsWithoutStealingVanillaForms() throws Exception { + File tags = new File(ROOT, "data/mineralogy/tags/items"); + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertTagValues(new File(tags, "stones/" + family + ".json"), + "mineralogy:" + family, "minecraft:" + family); + assertTagValues(new File(tags, "stones/" + family + "/smooth.json"), + "mineralogy:" + family + "_smooth", "minecraft:polished_" + family); + } + assertTagValues(new File(tags, "stones/basalt.json"), + "mineralogy:basalt", "minecraft:basalt"); + assertTagValues(new File(tags, "stones/basalt/smooth.json"), + "mineralogy:basalt_smooth", "minecraft:polished_basalt", "minecraft:smooth_basalt"); + assertTagValues(new File(tags, "stones/tuff.json"), + "mineralogy:tuff", "minecraft:tuff"); + assertTagValues(new File(tags, "stones/tuff/smooth.json"), + "mineralogy:tuff_smooth"); + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertTagValues(new File(tags, "slabs/" + family + ".json"), + "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab"); + assertTagValues(new File(tags, "slabs/" + family + "/smooth.json"), + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + } + assertTagValues(new File(tags, "slabs/basalt.json"), "mineralogy:basalt_slab"); + assertTagValues(new File(tags, "slabs/basalt/smooth.json"), + "mineralogy:basalt_smooth_slab"); + + assertRecipeIngredient("basalt_slab", "tag", "mineralogy:stones/basalt"); + assertRecipeIngredient("basalt_stairs", "tag", "mineralogy:stones/basalt"); + assertRecipeIngredient("basalt_wall", "tag", "mineralogy:stones/basalt"); + assertRecipeIngredient("basalt_smooth_slab", "tag", "mineralogy:stones/basalt/smooth"); + assertRecipeIngredient("basalt_smooth_stairs", "tag", "mineralogy:stones/basalt/smooth"); + assertRecipeIngredient("basalt_smooth_wall", "tag", "mineralogy:stones/basalt/smooth"); + assertRecipeIngredient("tuff_slab", "tag", "mineralogy:stones/tuff"); + assertRecipeIngredient("tuff_stairs", "tag", "mineralogy:stones/tuff"); + assertRecipeIngredient("tuff_wall", "tag", "mineralogy:stones/tuff"); + assertRecipeIngredient("tuff_smooth", "tag", "mineralogy:stones/tuff"); + + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertRecipeIngredient(family + "_slab", "item", "mineralogy:" + family); + assertRecipeIngredient(family + "_stairs", "item", "mineralogy:" + family); + assertRecipeIngredient(family + "_wall", "item", "mineralogy:" + family); + assertRecipeIngredient(family + "_smooth_slab", "item", + "mineralogy:" + family + "_smooth"); + assertRecipeIngredient(family + "_smooth_stairs", "item", + "mineralogy:" + family + "_smooth"); + assertRecipeIngredient(family + "_smooth_wall", "tag", + "mineralogy:stones/" + family + "/smooth"); + } + for (String family : Arrays.asList("andesite", "basalt", "diorite", "granite")) { + assertRecipeIngredient(family + "_brick", "tag", "mineralogy:stones/" + family); + assertAdvancementIngredient(family + "_brick", "tag", "mineralogy:stones/" + family); + assertRecipeIngredient(family + "_smooth", "item", "mineralogy:" + family); + assertAdvancementIngredient(family + "_smooth", "item", "mineralogy:" + family); + assertAdvancementIngredient(family + "_relief_blank", "tag", + "mineralogy:stones/" + family + "/smooth"); + + JsonObject vanillaPolished = json(new File(ROOT, + "data/minecraft/recipes/polished_" + family + ".json")); + assertEquals("minecraft:crafting_shapeless", + vanillaPolished.get("type").getAsString()); + assertEquals("minecraft:" + family, vanillaPolished.getAsJsonArray("ingredients") + .get(0).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:sand", vanillaPolished.getAsJsonArray("ingredients") + .get(1).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:polished_" + family, vanillaPolished + .getAsJsonObject("result").get("item").getAsString()); + assertEquals(1, vanillaPolished.getAsJsonObject("result").get("count").getAsInt()); + + JsonObject nativeAdvancement = json(new File(ROOT, + "data/minecraft/advancements/recipes/building_blocks/polished_" + + family + ".json")); + assertEquals("minecraft:" + family, nativeAdvancement.getAsJsonObject("criteria") + .getAsJsonObject("has_rock").getAsJsonObject("conditions") + .getAsJsonArray("items").get(0).getAsJsonObject() + .getAsJsonArray("items").get(0).getAsString()); + assertEquals("minecraft:sand", nativeAdvancement.getAsJsonObject("criteria") + .getAsJsonObject("has_sand").getAsJsonObject("conditions") + .getAsJsonArray("items").get(0).getAsJsonObject() + .getAsJsonArray("items").get(0).getAsString()); + assertEquals(2, nativeAdvancement.getAsJsonArray("requirements").size()); + } + + assertAdvancementIngredient("basalt_slab", "tag", "mineralogy:stones/basalt"); + assertAdvancementIngredient("andesite_slab", "item", "mineralogy:andesite"); + assertAdvancementIngredient("andesite_furnace", "tag", "mineralogy:slabs/andesite"); + + String allResources = new String(Files.readAllBytes( + new File(tags, "slabs/basalt.json").toPath()), StandardCharsets.UTF_8) + + new String(Files.readAllBytes( + new File(tags, "slabs/basalt/smooth.json").toPath()), StandardCharsets.UTF_8); + assertFalse(allResources.contains("minecraft:basalt_slab")); + assertFalse(allResources.contains("minecraft:polished_basalt_slab")); + } + + @Test + public void acceptedRecipeDetailsArePresent() throws Exception { + File recipes = new File(ROOT, "data/mineralogy/recipes"); + assertEquals(4, json(new File(recipes, "gypsum_dust.json")) + .getAsJsonObject("result").get("count").getAsInt()); + assertEquals(2, json(new File(recipes, "gypsum.json")).getAsJsonArray("pattern").size()); + assertEquals("minecraft:charcoal", json(new File(recipes, "gunpowder_from_charcoal.json")) + .getAsJsonArray("ingredients").get(0).getAsJsonObject().get("item").getAsString()); + assertFalse(new File(recipes, "gunpowder_from_coal.json").exists()); + assertGunpowderRecipe(recipes, "gunpowder_from_sugar", null); + assertGunpowderRecipe(recipes, "gunpowder_from_charcoal", null); + assertGunpowderRecipe(recipes, "gunpowder_from_carbon_dust", "forge:dusts/carbon"); + assertGunpowderRecipe(recipes, "gunpowder_from_coal_dust", "forge:dusts/coal"); + 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()); + 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")); + assertEquals("mineralogy:slabs/basalt", furnace.getAsJsonObject("key") + .getAsJsonObject("x").get("tag").getAsString()); + assertEquals("minecraft:furnace", furnace.getAsJsonObject("key") + .getAsJsonObject("y").get("item").getAsString()); + assertFalse(new File(recipes, "basalt_furnace_from_rock.json").exists()); + JsonObject furnaceOverride = json(new File(ROOT, "data/minecraft/recipes/furnace.json")); + JsonObject vanillaFurnace = conditionalRecipe(furnaceOverride, 0); + assertEquals("mineralogy:stone_crafting_materials", vanillaFurnace.getAsJsonObject("key") + .getAsJsonObject("#").get("tag").getAsString()); + 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() + .get("flag").getAsString()); + assertTrue(new File(ROOT, "data/minecraft/recipes/stone_pickaxe.json").isFile()); + assertEquals("#forge:cobblestone", json(new File(ROOT, + "data/minecraft/tags/items/stone_crafting_materials.json")) + .getAsJsonArray("values").get(0).getAsString()); + assertEquals("#forge:cobblestone", json(new File(ROOT, + "data/minecraft/tags/items/stone_tool_materials.json")) + .getAsJsonArray("values").get(0).getAsString()); + assertTagValues(new File(ROOT, "data/forge/tags/items/cobblestone.json"), + "mineralogy:chert", "mineralogy:pumice"); + assertTagValues(new File(ROOT, "data/forge/tags/blocks/cobblestone.json"), + "mineralogy:chert", "mineralogy:pumice"); + assertFalse(new File(ROOT, "data/mineralogy/tags/items/vanilla_furnace_materials.json").exists()); + for (String moss : Arrays.asList("mossy_cobblestone_from_vine", + "mossy_cobblestone_from_moss_block")) { + JsonObject wrapper = json(new File(ROOT, "data/minecraft/recipes/" + moss + ".json")); + assertEquals(moss, "mossy_cobblestone", conditionalRecipe(wrapper, 0) + .get("group").getAsString()); + assertEquals(moss, "mossy_cobblestone", conditionalRecipe(wrapper, 1) + .get("group").getAsString()); + } + assertEquals("minecraft:red_dye", json(new File(recipes, "drywall_red.json")) + .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:green_dye", json(new File(recipes, "drywall_green.json")) + .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:yellow_dye", json(new File(recipes, "drywall_yellow.json")) + .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); + } + + @Test + public void allSeventeenLocalesHaveOrdered938KeyParity() throws Exception { + File directory = new File(ROOT, "assets/mineralogy/lang"); + Set expectedFiles = new HashSet(Arrays.asList( + "de_au.json", "de_de.json", "en_ca.json", "en_en.json", "en_gb.json", + "en_pt.json", "en_us.json", "es_es.json", "es_mx.json", "fr_ca.json", + "fr_fr.json", "ja_jp.json", "ko_kr.json", "pt_br.json", "pt_pt.json", + "ru_ru.json", "zh_cn.json")); + File[] files = directory.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + Set actual = new HashSet(); + for (File file : files) actual.add(file.getName()); + assertEquals(expectedFiles, actual); + + List keys = keys(json(new File(directory, "en_us.json"))); + assertEquals(938, keys.size()); + for (File file : files) { + byte[] bytes = Files.readAllBytes(file.toPath()); + assertFalse(file.getName(), bytes.length >= 3 && bytes[0] == (byte) 0xef + && bytes[1] == (byte) 0xbb && bytes[2] == (byte) 0xbf); + String text = new String(bytes, StandardCharsets.UTF_8); + assertFalse(file.getName(), text.contains("\ufffd")); + assertTrue(file.getName(), text.endsWith("\n")); + assertEquals(file.getName(), keys, keys(json(file))); + } + assertPair(directory, "de_au.json", "de_de.json"); + assertPair(directory, "es_es.json", "es_mx.json"); + assertPair(directory, "fr_ca.json", "fr_fr.json"); + assertPair(directory, "pt_br.json", "pt_pt.json"); + JsonObject japanese = json(new File(directory, "ja_jp.json")); + assertEquals("原油入りバケツ", japanese.get("item.mineralogy.crude_oil_bucket").getAsString()); + JsonObject russian = json(new File(directory, "ru_ru.json")); + assertEquals("Ведро сырой нефти", russian.get("item.mineralogy.crude_oil_bucket").getAsString()); + } + + @Test + public void forge40ResourcesRetainNativeWallsTagsAndPackFormat() throws Exception { + JsonObject pack = json(new File(ROOT, "pack.mcmeta")); + assertEquals(9, pack.getAsJsonObject("pack").get("pack_format").getAsInt()); + + File blockstates = new File(ROOT, "assets/mineralogy/blockstates"); + File[] wallStates = blockstates.listFiles((dir, name) -> name.endsWith("_wall.json")); + assertNotNull(wallStates); + assertEquals(108, wallStates.length); + for (File state : wallStates) { + assertTrue(state.getName(), new String(Files.readAllBytes(state.toPath()), StandardCharsets.UTF_8) + .contains("_wall_side_tall")); + } + File models = new File(ROOT, "assets/mineralogy/models/block"); + File[] tallSides = models.listFiles((dir, name) -> name.endsWith("_wall_side_tall.json")); + assertNotNull(tallSides); + assertEquals(108, tallSides.length); + + assertTrue(new File(ROOT, "data/minecraft/tags/blocks/walls.json").isFile()); + assertTrue(new File(ROOT, "data/minecraft/tags/items/walls.json").isFile()); + File minecraftRecipes = new File(ROOT, "data/minecraft/recipes"); + File[] overrides = minecraftRecipes.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(overrides); + assertEquals(35, overrides.length); + Set overrideNames = new HashSet(); + for (File override : overrides) overrideNames.add(override.getName()); + Set expected = new HashSet(Arrays.asList( + "furnace.json", "brewing_stand.json", "lever.json", "piston.json", + "dispenser.json", "dropper.json", "observer.json", + "mossy_cobblestone_from_vine.json", "mossy_cobblestone_from_moss_block.json", + "andesite.json", "diorite.json", "stone_axe.json", "stone_hoe.json", + "stone_pickaxe.json", "stone_shovel.json", "stone_sword.json", + "polished_andesite.json", "polished_basalt.json", + "polished_diorite.json", "polished_granite.json")); + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + expected.add(family + "_slab.json"); + expected.add("polished_" + family + "_slab.json"); + expected.add(family + "_slab_from_" + family + "_stonecutting.json"); + expected.add("polished_" + family + "_slab_from_" + family + "_stonecutting.json"); + expected.add("polished_" + family + "_slab_from_polished_" + family + + "_stonecutting.json"); + } + assertEquals(expected, overrideNames); + File[] stonecutting = new File(ROOT, "data/mineralogy/recipes") + .listFiles((dir, name) -> name.contains("stonecutting")); + assertNotNull(stonecutting); + assertEquals(0, stonecutting.length); + } + + @Test + public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws Exception { + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertNativeSlabOverride(family + "_slab", "minecraft:" + family, + "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab", 6); + assertNativeSlabOverride("polished_" + family + "_slab", + "minecraft:polished_" + family, "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab", 6); + assertNativeStonecuttingOverride(family + "_slab_from_" + family + "_stonecutting", + "minecraft:" + family, "mineralogy:" + family + "_slab", + "minecraft:" + family + "_slab"); + assertNativeStonecuttingOverride("polished_" + family + "_slab_from_" + family + + "_stonecutting", "minecraft:" + family, + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + assertNativeStonecuttingOverride("polished_" + family + "_slab_from_polished_" + + family + "_stonecutting", "minecraft:polished_" + family, + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + assertNativeSlabConversion(family + "_slab_to_vanilla", + "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab"); + assertNativeSlabConversion(family + "_slab_from_vanilla", + "minecraft:" + family + "_slab", "mineralogy:" + family + "_slab"); + assertNativeSlabConversion(family + "_smooth_slab_to_vanilla", + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + assertNativeSlabConversion(family + "_smooth_slab_from_vanilla", + "minecraft:polished_" + family + "_slab", + "mineralogy:" + family + "_smooth_slab"); + } + + assertCompositeRockTag("cobblestone_equivalents", "#forge:cobblestone"); + assertCompositeRockTag("stone_crafting_materials", "#minecraft:stone_crafting_materials"); + assertCompositeRockTag("stone_tool_materials", "#minecraft:stone_tool_materials"); + for (String family : rockFamilies()) { + File blockTag = new File(ROOT, "data/mineralogy/tags/blocks/stones/" + family + ".json"); + assertTrue(family, blockTag.isFile()); + assertTrue(family, json(blockTag).getAsJsonArray("values").toString() + .contains("mineralogy:" + family)); + } + assertTagValues(new File(ROOT, "data/mineralogy/tags/blocks/stones/basalt.json"), + "mineralogy:basalt", "minecraft:basalt"); + + 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) + .getAsJsonObject("criteria").getAsJsonObject("has_cobblestone") + .getAsJsonObject("conditions").getAsJsonArray("items").get(0) + .getAsJsonObject().get("tag").getAsString()); + assertEquals("minecraft:stone_crafting_materials", conditionalAdvancement(furnace, 1) + .getAsJsonObject("criteria").getAsJsonObject("has_cobblestone") + .getAsJsonObject("conditions").getAsJsonArray("items").get(0) + .getAsJsonObject().get("tag").getAsString()); + + Object[][] advancementContracts = { + { "decorations/furnace", "has_cobblestone", "tag", + "mineralogy:stone_crafting_materials", "minecraft:stone_crafting_materials" }, + { "brewing/brewing_stand", "has_blaze_rod", "item", + "minecraft:blaze_rod", "minecraft:blaze_rod" }, + { "redstone/lever", "has_cobblestone", "tag", + "mineralogy:cobblestone_equivalents", "forge:cobblestone" }, + { "redstone/piston", "has_redstone", "item", "minecraft:redstone", "minecraft:redstone" }, + { "redstone/dispenser", "has_bow", "item", "minecraft:bow", "minecraft:bow" }, + { "redstone/dropper", "has_redstone", "item", "minecraft:redstone", "minecraft:redstone" }, + { "redstone/observer", "has_quartz", "item", "minecraft:quartz", "minecraft:quartz" }, + { "building_blocks/mossy_cobblestone_from_vine", "has_vine", "item", "minecraft:vine", "minecraft:vine" }, + { "building_blocks/mossy_cobblestone_from_moss_block", "has_moss_block", "item", "minecraft:moss_block", "minecraft:moss_block" }, + { "building_blocks/andesite", "has_stone", "item", "minecraft:diorite", "minecraft:diorite" }, + { "building_blocks/diorite", "has_quartz", "item", "minecraft:quartz", "minecraft:quartz" }, + { "tools/stone_axe", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "tools/stone_hoe", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "tools/stone_pickaxe", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "tools/stone_shovel", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "combat/stone_sword", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" } + }; + for (Object[] contract : advancementContracts) { + assertConditionalAdvancement(new File(advancementRoot, contract[0] + ".json"), + (String) contract[1], (String) contract[2], (String) contract[3], + (String) contract[4]); + } + } + + @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.0.118021")); + assertTrue(properties.contains("orespawn_curse_file_id=8750114")); + 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("orespawnRelease")); + String metadata = new String(Files.readAllBytes(new File(ROOT, "META-INF/mods.toml").toPath()), StandardCharsets.UTF_8); + assertTrue(metadata.contains("loaderVersion=\"[40,)\"")); + assertTrue(metadata.contains("versionRange=\"[40.3.0,41)\"")); + 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()); + assertTrue(new File(ROOT, "assets/mineralogy/textures/blocks/crude_oil_still.png").isFile()); + String fluidSource = new String(Files.readAllBytes(new File( + "src/main/java/zone/moddev/mc/mineralogy/init/MineralogyFluids.java").toPath()), StandardCharsets.UTF_8); + assertTrue(fluidSource.contains("\"flowing_crude_oil\"")); + assertTrue(fluidSource.contains("\"crude_oil_bucket\"")); + assertFalse(fluidSource.contains("new ResourceLocation(\"crude_oil\")")); + } + + @Test + public void internalWorldgenAndRetiredPackagesAreAbsent() throws Exception { + assertFalse(containsJava(new File("src/main/java/com/mcmoddev/mineralogy"))); + assertFalse(containsJava(new File("src/main/java/zone/moddev/mc/mineralogy/worldgen"))); + String main = new String(Files.readAllBytes(new File( + "src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java").toPath()), StandardCharsets.UTF_8); + assertFalse(main.contains("registerWorldGenerator")); + assertFalse(main.contains("StoneReplacer")); + assertFalse(main.contains("OreSpawner")); + } + + 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(); + } + + private static void assertInventoryPredicates(String source, JsonObject advancement) { + for (Map.Entry entry : advancement.getAsJsonObject("criteria").entrySet()) { + JsonObject criterion = entry.getValue().getAsJsonObject(); + if (!"minecraft:inventory_changed".equals(criterion.get("trigger").getAsString())) { + continue; + } + JsonArray predicates = criterion.getAsJsonObject("conditions").getAsJsonArray("items"); + 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", + predicate.has("item")); + assertTrue(source + " " + entry.getKey(), predicate.has("tag") + || (predicate.has("items") && predicate.getAsJsonArray("items").size() > 0)); + } + } + } + + private static String expectedSlabTag(String furnaceRecipe) { + String stem = furnaceRecipe.replaceFirst("_furnace$", ""); + for (String finish : Arrays.asList("smooth_brick", "smooth", "brick")) { + String suffix = "_" + finish; + if (stem.endsWith(suffix)) { + return "mineralogy:slabs/" + stem.substring(0, stem.length() - suffix.length()) + + "/" + finish; + } + } + return "mineralogy:slabs/" + stem; + } + + private static void assertTagValues(File file, String... expected) throws Exception { + JsonArray values = json(file).getAsJsonArray("values"); + assertEquals(file.getPath(), expected.length, values.size()); + for (int index = 0; index < expected.length; index++) { + assertEquals(file.getPath(), expected[index], values.get(index).getAsString()); + } + } + + private static void assertRecipeIngredient(String recipeName, String key, String value) + throws Exception { + JsonObject recipe = json(new File(ROOT, + "data/mineralogy/recipes/" + recipeName + ".json")); + JsonObject ingredient = recipe.has("key") + ? recipe.getAsJsonObject("key").getAsJsonObject("x") + : recipe.getAsJsonArray("ingredients").get(0).getAsJsonObject(); + assertEquals(recipeName, value, ingredient.get(key).getAsString()); + assertEquals(recipeName, 1, ingredient.size()); + } + + private static void assertAdvancementIngredient(String recipeName, String key, String value) + throws Exception { + JsonObject advancement = json(new File(ROOT, + "data/mineralogy/advancements/recipes/" + recipeName + ".json")); + 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()); + } + assertEquals(recipeName, 1, ingredient.size()); + } + + private static void assertNativeSlabOverride(String recipeName, String source, + String mineralogyResult, String vanillaResult, int count) throws Exception { + JsonObject wrapper = json(new File(ROOT, "data/minecraft/recipes/" + recipeName + ".json")); + assertEquals(recipeName, "forge:conditional", wrapper.get("type").getAsString()); + JsonObject enabled = conditionalRecipe(wrapper, 0); + JsonObject fallback = conditionalRecipe(wrapper, 1); + assertEquals(recipeName, source, enabled.getAsJsonObject("key") + .getAsJsonObject("#").get("item").getAsString()); + assertEquals(recipeName, mineralogyResult, + enabled.getAsJsonObject("result").get("item").getAsString()); + assertEquals(recipeName, vanillaResult, + fallback.getAsJsonObject("result").get("item").getAsString()); + assertEquals(recipeName, count, + enabled.getAsJsonObject("result").get("count").getAsInt()); + } + + private static void assertNativeStonecuttingOverride(String recipeName, String source, + String mineralogyResult, String vanillaResult) throws Exception { + JsonObject wrapper = json(new File(ROOT, "data/minecraft/recipes/" + recipeName + ".json")); + JsonObject enabled = conditionalRecipe(wrapper, 0); + JsonObject fallback = conditionalRecipe(wrapper, 1); + 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()); + } + + private static void assertNativeSlabConversion(String recipeName, String source, + String result) throws Exception { + JsonObject recipe = json(new File(ROOT, + "data/mineralogy/recipes/" + recipeName + ".json")); + assertEquals(recipeName, "minecraft:crafting_shapeless", recipe.get("type").getAsString()); + 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, 1, recipe.getAsJsonObject("result").get("count").getAsInt()); + assertEquals(recipeName, 2, recipe.getAsJsonArray("conditions").size()); + + JsonObject advancement = json(new File(ROOT, + "data/mineralogy/advancements/recipes/" + recipeName + ".json")); + assertEquals(recipeName, recipe.get("conditions"), advancement.get("conditions")); + assertEquals(recipeName, source, criterionItem(advancement, "has_rock")); + assertEquals(recipeName, "mineralogy:" + recipeName, + advancement.getAsJsonObject("rewards").getAsJsonArray("recipes") + .get(0).getAsString()); + } + + private static void assertCompositeRockTag(String name, String baseTag) throws Exception { + JsonArray values = json(new File(ROOT, + "data/mineralogy/tags/items/" + name + ".json")).getAsJsonArray("values"); + assertEquals(name, 28, values.size()); + assertEquals(name, baseTag, values.get(0).getAsString()); + for (int index = 0; index < rockFamilies().size(); index++) { + assertEquals(name, "#mineralogy:stones/" + rockFamilies().get(index), + values.get(index + 1).getAsString()); + } + } + + private static 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 JsonObject conditionalRecipe(JsonObject wrapper, int index) { + return wrapper.getAsJsonArray("recipes").get(index).getAsJsonObject() + .getAsJsonObject("recipe"); + } + + private static JsonObject conditionalAdvancement(JsonObject wrapper, int index) { + return wrapper.getAsJsonArray("advancements").get(index).getAsJsonObject() + .getAsJsonObject("advancement"); + } + + private static void assertConditionalAdvancement(File file, String criterion, String key, + String enabledValue, String fallbackValue) throws Exception { + 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()); + assertEquals(file.getPath(), "forge:not", wrapper.getAsJsonArray("advancements") + .get(1).getAsJsonObject().getAsJsonArray("conditions").get(0) + .getAsJsonObject().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); + JsonArray requirements = advancement.getAsJsonArray("requirements"); + assertEquals(file.getPath(), 1, requirements.size()); + assertTrue(file.getPath(), requirements.get(0).isJsonArray()); + assertEquals(file.getPath(), 2, requirements.get(0).getAsJsonArray().size()); + } + } + + private static int countJsonFiles(File directory) { + File[] children = directory.listFiles(); + if (children == null) return 0; + int count = 0; + for (File child : children) { + if (child.isDirectory()) count += countJsonFiles(child); + else if (child.getName().endsWith(".json")) count++; + } + return count; + } + + private static List jsonFiles(File directory) { + List files = new ArrayList(); + File[] children = directory.listFiles(); + if (children == null) return files; + for (File child : children) { + if (child.isDirectory()) files.addAll(jsonFiles(child)); + else if (child.getName().endsWith(".json")) files.add(child); + } + return files; + } + + 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(); + } + } + + 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")); + JsonObject advancement = json(new File(ROOT, + "data/mineralogy/advancements/recipes/" + name + ".json")); + assertGunpowderConditions(name + " advancement", requiredTag, + advancement.getAsJsonArray("conditions")); + } + + 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()); + if (requiredTag != null) { + 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()); + } + } + + private static List keys(JsonObject object) { + List result = new ArrayList(); + for (Map.Entry entry : object.entrySet()) result.add(entry.getKey()); + return result; + } + + private static void assertPair(File directory, String first, String second) throws Exception { + assertArrayEquals(Files.readAllBytes(new File(directory, first).toPath()), + Files.readAllBytes(new File(directory, second).toPath())); + } + + private static String stripJson(String name) { + return name.substring(0, name.length() - ".json".length()); + } + + private static boolean containsJava(File directory) { + if (!directory.isDirectory()) return false; + File[] children = directory.listFiles(); + if (children == null) return false; + for (File child : children) { + if (child.isFile() && child.getName().endsWith(".java")) return true; + if (containsJava(child)) return true; + } + return false; + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java new file mode 100644 index 000000000..13678b4c1 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java @@ -0,0 +1,120 @@ +package zone.moddev.mc.mineralogy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.FileInputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Properties; + +import org.junit.Test; + +public class WorkflowContractTest { + @Test + public void releaseMetadataIdentifiesTheGenericForgeTarget() throws Exception { + Properties properties = new Properties(); + try (FileInputStream input = new FileInputStream("gradle.properties")) { + properties.load(input); + } + assertEquals("6.1.0.118021", properties.getProperty("mod_version")); + assertEquals("1.18.2", 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("240974", properties.getProperty("curseforge_project_id")); + assertEquals("zone.moddev.mc.mineralogy", properties.getProperty("mod_group")); + assertEquals("4.0.10.118021", properties.getProperty("orespawn_version")); + assertEquals("8750114", properties.getProperty("orespawn_curse_file_id")); + assertEquals("BE863C3FDBEC50D36D74D2B06A462CDE1A3C6876BF587F8F52F6AFA0ED77E650", + properties.getProperty("orespawn_sha256")); + } + + @Test + public void ciAndSecurityChecksUsePinnedTargetNativeBuilds() throws Exception { + String ci = text(".github/workflows/ci.yml"); + String codeql = text(".github/workflows/codeql-analysis.yml"); + 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.18.2")); + assertTrue(ci.contains("java-version: '17.0.1+12'")); + assertTrue(ci.contains("Install pinned Java 17 runtime and toolchain")); + assertTrue(ci.contains("verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums")); + assertTrue(ci.contains("genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath")); + assertTrue(ci.contains("CHANGELOG.txt")); + assertTrue(ci.contains("-PorespawnVerificationRepository=${{ steps.orespawn.outputs.repository }}")); + assertTrue(staging.contains("https://www.curseforge.com/api/v1/mods/$project_id/files/$file_id/download")); + assertTrue(staging.contains("sha256sum")); + assertTrue(codeql.contains("github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28")); + assertTrue(codeql.contains("./gradlew clean classes")); + assertTrue(codeql.contains("--rerun-tasks --no-build-cache")); + assertTrue(wrapper.contains("gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb")); + } + + @Test + public void tagValidatorIsGenericAndDoesNotDispatchPublication() throws Exception { + String tag = text(".github/workflows/release-on-tag.yml"); + assertTrue(tag.contains("'*.*.*.*'")); + assertTrue(tag.contains("loader_name:$loader_code")); + assertTrue(tag.contains("Build, test, and audit")); + assertTrue(tag.contains("Release tag must equal mod_version")); + assertTrue(tag.contains("confirm live publication: checked")); + assertFalse(tag.contains("gh workflow run")); + assertFalse(tag.contains("actions: write")); + } + + @Test + 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")); + assertTrue(build.contains("preserveFileTimestamps = false")); + assertTrue(build.contains("reproducibleFileOrder = true")); + assertTrue(build.contains("def preparedReleaseDir = project.findProperty('preparedReleaseDir')")); + assertTrue(build.contains("tasks.register('verifyPreparedReleaseArtifacts')")); + assertTrue(build.contains("tasks.withType(PublishToMavenRepository).configureEach")); + assertTrue(build.contains("tasks.register('verifyMavenCoordinates')")); + assertTrue(build.contains("generatePomFileForMavenJavaPublication")); + assertTrue(build.contains("dependsOn tasks.named('verifyMavenCoordinates')")); + assertTrue(build.contains("expectedMavenGroup = 'zone.moddev.mc.mineralogy'")); + assertTrue(build.contains("expectedMavenArtifact = 'Mineralogy'")); + assertTrue(build.contains("'Maven-Artifact'")); + assertTrue(build.contains("Maven release publication must use a remote repository")); + assertTrue(build.contains("name = 'release'")); + assertFalse(build.contains("file:///${project.projectDir}/mcmodsrepo")); + } + + @Test + public void stagedOreSpawnDependencyCannotFallThroughToPublicRepositories() throws Exception { + String build = text("build.gradle"); + assertTrue(build.contains("exclusiveContent")); + assertTrue(build.contains("forRepository")); + assertTrue(build.contains("includeModule('curse.maven', orespawnModule)")); + assertTrue(build.contains("'OreSpawnReleaseVerificationMirror'")); + } + + @Test + public void eclipseLaunchGuardQuotesEverySlimeLauncherPathThatMayContainSpaces() throws Exception { + String build = text("build.gradle"); + assertTrue(build.contains("['cache', 'metadata', 'to-srg', 'to-obf'].each")); + assertTrue(build.contains("arguments.substring(0, valueStart)}"${value}"")); + assertTrue(build.contains("String legacyClassPathPrefix = '-DlegacyClassPath.file='")); + assertTrue(build.contains("text = beforeLegacyClassPath + xmlQuote + legacyClassPathArgument")); + assertTrue(build.contains("Eclipse launch does not quote -DlegacyClassPath.file")); + assertTrue(build.contains("layout.buildDirectory.dir('resources/main').get().asFile")); + assertTrue(build.contains("Eclipse output contains stale or unexpanded mods.toml metadata")); + assertTrue(build.contains("eclipseMetadata.contains('${')")); + } + + 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 new file mode 100644 index 000000000..06870d0c7 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java @@ -0,0 +1,57 @@ +package zone.moddev.mc.mineralogy.compat; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.IdentityHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraft.core.Holder; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Blocks; + +import org.junit.Test; + +public class CobblestoneTagPolicyTest { + @Test + public void rebuiltTagPreservesVanillaAndAddsOrRemovesConfiguredElements() { + Holder vanilla = holder(Blocks.COBBLESTONE.asItem()); + Holder mineralogyStandIn = holder(Blocks.BASALT.asItem()); + TagKey cobblestone = TagKey.create(Registry.ITEM_REGISTRY, + new ResourceLocation("forge", "cobblestone")); + Map, List>> tags = new IdentityHashMap<>(); + tags.put(cobblestone, list(vanilla)); + + CobblestoneTagPolicy.updateTag(tags, Registry.ITEM, Registry.ITEM_REGISTRY, + cobblestone.location(), set(mineralogyStandIn), true); + assertEquals(list(vanilla, mineralogyStandIn), tags.get(cobblestone)); + + CobblestoneTagPolicy.updateTag(tags, Registry.ITEM, Registry.ITEM_REGISTRY, + cobblestone.location(), set(mineralogyStandIn), false); + assertEquals(list(vanilla), tags.get(cobblestone)); + } + + private static Holder holder(Item item) { + return Registry.ITEM.getHolderOrThrow(Registry.ITEM.getResourceKey(item).get()); + } + + @SafeVarargs + private static Set set(T... values) { + Set result = new LinkedHashSet<>(); + for (T value : values) result.add(value); + return result; + } + + @SafeVarargs + private static List list(T... values) { + List result = new ArrayList<>(); + for (T value : values) result.add(value); + return result; + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterSourceTest.java b/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterSourceTest.java new file mode 100644 index 000000000..b1f2f476f --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterSourceTest.java @@ -0,0 +1,44 @@ +package zone.moddev.mc.mineralogy.documentation; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.io.InputStream; + +import org.junit.Test; + +public class DocumentationExporterSourceTest { + @Test + public void eclipseRunDirectoryFindsAuthoritativeGuideSources() { + Path project = Paths.get("").toAbsolutePath().normalize(); + Path expected = project.resolve("docs/README.md").normalize(); + assertEquals(expected, + DocumentationExporter.findDevelopmentSource(project.resolve("run"), "docs/README.md")); + } + + @Test + public void unrelatedDirectoryDoesNotBecomeADevelopmentFallback() throws Exception { + Path unrelated = Files.createTempDirectory("mineralogy-guide-unrelated"); + assertNull(DocumentationExporter.findDevelopmentSource(unrelated, "docs/README.md")); + } + + @Test + public void missingEclipseClasspathResourceReadsAuthoritativeSourceFile() throws Exception { + byte[] expected = Files.readAllBytes(Paths.get("docs/README.md")); + byte[] actual = new byte[expected.length]; + try (InputStream source = DocumentationExporter.openSource( + "/missing-from-eclipse-bin-main.md", "docs/README.md")) { + int offset = 0; + while (offset < actual.length) { + int read = source.read(actual, offset, actual.length - offset); + if (read < 0) break; + offset += read; + } + assertEquals(expected.length, offset); + } + org.junit.Assert.assertArrayEquals(expected, actual); + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterTest.java b/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterTest.java deleted file mode 100644 index f05b6f523..000000000 --- a/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package zone.moddev.mc.mineralogy.documentation; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; - -class DocumentationExporterTest { - @TempDir - Path temporaryDirectory; - - @Test - void exportsCompleteGuideAndDoesNotOverwriteExistingFiles() throws Exception { - assertEquals(7, DocumentationExporter.exportMissing(temporaryDirectory)); - assertTrue(Files.isRegularFile(temporaryDirectory.resolve("README.md"))); - assertTrue(Files.isRegularFile(temporaryDirectory.resolve("DEVELOPER_GUIDE.md"))); - assertTrue(Files.isRegularFile(temporaryDirectory.resolve( - "examples/mineralogy-provider.json"))); - - Path readme = temporaryDirectory.resolve("README.md"); - Files.write(readme, "local note".getBytes(StandardCharsets.UTF_8)); - assertEquals(0, DocumentationExporter.exportMissing(temporaryDirectory)); - assertEquals("local note", new String(Files.readAllBytes(readme), - StandardCharsets.UTF_8)); - } -} diff --git a/src/test/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizerTest.java b/src/test/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizerTest.java new file mode 100644 index 000000000..4f48d196a --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizerTest.java @@ -0,0 +1,33 @@ +package zone.moddev.mc.mineralogy.patching; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class LegacyTileEntityIdNormalizerTest { + @Test + public void mapsEveryLegacyVanillaTileSeenByPreFlatteningWorlds() { + assertEquals("minecraft:chest", LegacyTileEntityIdNormalizer.normalize("Chest")); + assertEquals("minecraft:furnace", LegacyTileEntityIdNormalizer.normalize("Furnace")); + assertEquals("minecraft:enchanting_table", LegacyTileEntityIdNormalizer.normalize("EnchantTable")); + assertEquals("minecraft:flower_pot", LegacyTileEntityIdNormalizer.normalize("FlowerPot")); + assertEquals("minecraft:hopper", LegacyTileEntityIdNormalizer.normalize("Hopper")); + assertEquals("minecraft:mob_spawner", LegacyTileEntityIdNormalizer.normalize("MobSpawner")); + assertEquals("minecraft:jukebox", LegacyTileEntityIdNormalizer.normalize("RecordPlayer")); + assertEquals("minecraft:brewing_stand", LegacyTileEntityIdNormalizer.normalize("Cauldron")); + } + + @Test + public void preservesAlreadyValidNamespacedModTiles() { + assertEquals("mineralogy:rock_furnace", + LegacyTileEntityIdNormalizer.normalize("mineralogy:rock_furnace")); + assertEquals("poweradvantage.item_conveyor", + LegacyTileEntityIdNormalizer.normalize("poweradvantage.item_conveyor")); + } + + @Test + public void makesUnknownOldModIdentifiersParseableWithoutDiscardingTheirNbt() { + assertEquals("minecraft:pamapiary", LegacyTileEntityIdNormalizer.normalize("PamApiary")); + assertEquals("old_mod:odd_tile", LegacyTileEntityIdNormalizer.normalize("Old Mod:Odd Tile")); + } +}